Imported Upstream version 2.2.37upstream/2.2.37

201 files changed, 43742 insertions, 37954 deletions

diff --git a/AUTHORS b/AUTHORS
index 3b82ebd..7daa3ef 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,7 +17,7 @@ List of Copyright holders
 
   Copyright (C) 1997-2019 Werner Koch
   Copyright (C) 1994-2021 Free Software Foundation, Inc.
-  Copyright (C) 2003-2021 g10 Code GmbH
+  Copyright (C) 2003-2022 g10 Code GmbH
   Copyright (C) 2002 Klarälvdalens Datakonsult AB
   Copyright (C) 1995-1997, 2000-2007 Ulrich Drepper <drepper@gnu.ai.mit.edu>
   Copyright (C) 1994 X Consortium
diff --git a/ChangeLog b/ChangeLog
index c6372be..f67aab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,905 @@
+2022-08-24  Werner Koch  <wk@gnupg.org>
+
+	Release 2.2.37.
+	+ commit 8e60f885713b833dfd8cef7f5b0272df0e48d62f
+
+
+2022-08-19  Werner Koch  <wk@gnupg.org>
+
+	gpgsm: New option --compatibility-flags.
+	+ commit 77b6896f7a85a4b1c9cdd731e1d68d59a0e09950
+	* sm/gpgsm.c (oCompatibilityFlags): New option.
+	(compatibility_flags): new.
+	(main): Parse and print them in verbose mode.
+	* sm/gpgsm.h (opt): Add field compat_glags.:
+	(COMPAT_ALLOW_KA_TO_ENCR): New.
+	* sm/keylist.c (print_capabilities): Take care of the new flag.
+	* sm/certlist.c (cert_usage_p): Ditto.
+
+	* common/miscellaneous.c (parse_compatibility_flags): New.
+	* common/util.h (struct compatibility_flags_s): New.
+
+2022-08-17  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: Make --auto-key-import and --include-key-block visible again.
+	+ commit b356eddf3d7a1ed0fae808b9277134d50f4974af
+	* tools/gpgconf-comp.c: Add options.
+
+2022-08-16  Werner Koch  <wk@gnupg.org>
+
+	agent: Fix bug introduced earlier today.
+	+ commit 3591112fdb013dee1a1a668c9f777d0890520311
+	* agent/findkey.c (agent_write_private_key): Fix condition.
+
+	gpg: Fix "generate" command in --card-edit.
+	+ commit 914ee7247562dc8f1e4b8503b3b574a5d2749bde
+	* g10/card-util.c (get_info_for_key_operation): Get the APPTYPE before
+	testing for it.
+
+	* g10/card-util.c (current_card_status): Always try to update the
+	shadow keys.
+	* g10/call-agent.c (agent_scd_getattr): Handle $AUTHKEYID.
+
+	gpg: Update shadow-keys with --card-status also for non-openpgp cards.
+	+ commit 2d23a72690b44528783264a93e170585a99cc774
+	* agent/command.c (cmd_readkey): Also allow for $AUTHKEYID in card
+	mode.
+	* g10/call-agent.c (agent_update_shadow_keys): new.
+	* g10/card-util.c (current_card_status): Call it.
+
+	agent: Let READKEY update the display-s/n of the Token entry.
+	+ commit 755920d4335730fbf25e24342dc9c8a8a772dac3
+	* agent/findkey.c (agent_write_private_key): Factor file name
+	generation out to ...
+	(fname_from_keygrip): new.
+	(write_extended_private_key): Add and implement new arg MAYBE_UPDATE.
+	(agent_write_shadow_key): Ditto.
+
+	* agent/command.c (cmd_readkey): Update the shadow-key in card mode.
+
+	gpg: Fix --card-status to handle lowercase APPTYPEs.
+	+ commit 8e393e2592646f7d2a11ec32232b8f29eacdce13
+	* g10/card-util.c (current_card_status): Use ascii_strcasecmp.
+
+2022-08-16  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: Fix detecting OpenPGP card by serialno.
+	+ commit 27ae89db6e6901a8fd6f1dce50a25c1a4b845086
+	* g10/card-util.c (get_info_for_key_operation): Use ->apptype to
+	determine card's APP.
+	(current_card_status): Even if its SERIALNO is not like OpenPGP card,
+	it's OpenPGP card when app says so.
+
+2022-08-16  Werner Koch  <wk@gnupg.org>
+
+	common: In private key mode write "Key:" always last in name-value.
+	+ commit 12ad9529782df1eecf628281b8db62cafd775c4f
+	* common/name-value.c (nvc_write): Take care of Key. Factor some code
+	out to ...
+	(write_one_entry): new.
+
+2022-08-15  Werner Koch  <wk@gnupg.org>
+
+	agent: Create and use Token entries to track the display s/n.
+	+ commit dc9b2426288e4eb6ab42aa7f731a35bc8d383b46
+	* agent/divert-scd.c (linefeed_to_percent0A): New.
+	(ask_for_card): Add arg grip.  Read Token and Label items and use
+	them.
+	(divert_pksign, divert_pkdecrypt): Pass down grip.
+	* agent/findkey.c (write_extended_private_key): Add args serialno,
+	keyref, and dispserialno.  Writen Token item.
+	(agent_write_private_key): Add args serialno, keyref, and
+	dispserialno.
+	(read_key_file): Add arg r_keymeta.
+	(agent_keymeta_from_file): New.
+	(agent_write_shadow_key): Remove leading spaces from serialno and keyid.
+	* agent/protect-tool.c (agent_write_private_key): Ditto.
+	* agent/learncard.c (agent_handle_learn): Get DISPSERIALNO and pass to
+	agent_write_shadow_key.
+	* agent/command-ssh.c (card_key_available): Ditto.
+
+	common: New function nve_set.
+	+ commit 706adf669173ec604158e4a2f4337e3da6cb1e45
+	* common/name-value.c (nve_set): New.
+	(nvc_set): Use nve_set.
+	(nvc_delete_named): New.
+	(nvc_get_string): New.
+	(nvc_get_boolean): New.
+
+2022-08-04  Werner Koch  <wk@gnupg.org>
+
+	gpg: Fix wrong error message for keytocard.
+	+ commit f2a81e3745017072585c9999a129ee5dd0bdc6e6
+	* g10/call-agent.c (agent_keytocard): Emit SC_OP_FAILURE.
+
+2022-08-03  Werner Koch  <wk@gnupg.org>
+
+	common: Silence warnings from AllowSetForegroundWindow.
+	+ commit 6583abedf3f0ffe5cc8283fe683144fc1d5add40
+	* common/sysutils.c (gnupg_allow_set_foregound_window): Print warning
+	only with debug flag set.
+
+	dirmngr: Fix failed malloc error message.
+	+ commit 94908857e1f54a3550a3704a5de6bd10b7902169
+	* dirmngr/ocsp.c (check_signature): Fix error printing of xtrymalloc.
+
+	gpgconf: Add config file for Windows Registry dumps.
+	+ commit ebb736b2c310c8736d1165be9c8e2de413dd0ac6
+	* tools/gpgconf.c (show_registry_entries_from_file): New.
+	(show_configs): Call it.
+	* doc/examples/gpgconf.rnames: New.
+	* doc/Makefile.am (examples): Add it.
+
+2022-08-02  Werner Koch  <wk@gnupg.org>
+
+	gpg: Make symmetric + pubkey encryption de-vs compliant.
+	+ commit e8011a7ceca7d5d9fd703f227e56931a7ea151d6
+	* g10/mainproc.c (proc_encrypted): Make symmetric + pubkey encryption
+	de-vs compliant.
+
+	* g10/mainproc.c (struct symlist_item): New.
+	(struct mainproc_context): Add field symenc_list.
+	(release_list): Free that list.
+	(proc_symkey_enc): Record infos from symmetric session packet.
+	(proc_encrypted): Check symkey packet algos
+
+	gpgconf: Improve registry dumping.
+	+ commit 6bc959231802d60694b7677d3537261d9cda1e1d
+	* common/w32-reg.c (read_w32_registry_string): Map REG_DWORD to a
+	string.
+	(read_w32_reg_string): Add arg r_hklm_fallback and change all callers.
+	(show_configs): Indicate whether the HKLM fallback was used.
+	* tools/gpgconf.c (show_other_registry_entries): Fix the Outlook Addin
+	Registry key.  Indicate whether the HKLM fallback was used.
+
+2022-07-28  Werner Koch  <wk@gnupg.org>
+
+	gpg: For de-vs use SHA-256 instead of SHA-1 as implicit preference.
+	+ commit 890e616593af5d1e0f2eb932768205ef90928e5e
+	* g10/pkclist.c (select_algo_from_prefs): Change implicit hash
+	algorithm.
+
+2022-07-27  Werner Koch  <wk@gnupg.org>
+
+	agent: New option --no-user-trustlist and --sys-trustlist-name.
+	+ commit d0bd91ba73a7e333e9b5007875c9bd475fb9581e
+	* agent/gpg-agent.c (oNoUserTrustlist,oSysTrustlistName): New.
+	(opts): Add new option names.
+	(parse_rereadable_options): Parse options.
+	(finalize_rereadable_options): Reset allow-mark-trusted for the new
+	option.
+	* agent/agent.h (opt): Add fields no_user_trustlist and
+	sys_trustlist_name.
+	* agent/trustlist.c (make_sys_trustlist_name): New.
+	(read_one_trustfile): Use here.
+	(read_trustfiles): Use here.  Implement --no-user-trustlist.  Also
+	repalce "allow_include" by "systrust" and adjust callers.
+
+2022-07-27  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	gpg: Look up user ID to revoke by UID hash.
+	+ commit abe69b2094dd749fc2f285b672d30a4f1e3f12a7
+	* g10/keyedit.c (find_userid_by_namehash, find_userid): New.
+	(keyedit_quick_revuid): Use find_userid() instead of iterating over the
+	nodes of the keyblock.
+	* tests/openpgp/quick-key-manipulation.scm: Add test for revoking a
+	user ID specified by its hash.
+
+2022-07-27  Werner Koch  <wk@gnupg.org>
+
+	wkd: Bind the address to the nonce.
+	+ commit 73a98c13969169fee6bf5eaa71507a409eb17caf
+	* tools/gpg-wks-server.c (make_pending_fname): New.
+	(store_key_as_pending, check_and_publish): Use here.
+	(process_new_key): Pass addrspec to store_key_as_pending.
+	(expire_one_domain): Expire also the new files.
+
+2022-07-26  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	dirmngr: Ask keyservers to provide the key fingerprints.
+	+ commit 22e8dc792702cd485408b5a8212d34a3917851ca
+	* dirmngr/ks-engine-hkp.c (ks_hkp_search): Add "fingerprint=on" to
+	request URL.
+
+2022-07-25  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	gpg: Request keygrip of key to add via command interface.
+	+ commit ee8f1c10a7a54714fb2a9ca141d38e666b9a424d
+	* g10/keygen.c (ask_algo): Request keygrip via cpr_get.
+	* doc/help.txt (gpg.keygen.keygrip): New help text.
+
+2022-07-25  Werner Koch  <wk@gnupg.org>
+
+	wkd: Fix path traversal attack on gpg-wks-server.
+	+ commit c1489ca0e101a81df6f8b1ba8d8a9afd9ebc6412
+	* tools/gpg-wks-server.c (check_and_publish): Check for invalid
+	characters in sender controlled data.
+	* tools/wks-util.c (wks_fname_from_userid): Ditto.
+	(wks_compute_hu_fname): Ditto.
+	(ensure_policy_file): Ditto.
+
+2022-07-13  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd:openpgp: Fix workaround for Yubikey heuristics.
+	+ commit 8c9f879d4aa01ad96320869fb3da83a843292504
+	* scd/app-openpgp.c (parse_algorithm_attribute): Handle the case
+	of firmware 5.4, too.
+
+	scd: Fail when no good algorithm attribute.
+	+ commit 225c66f13b8700d9d283367705b31070a3d38d93
+	* scd/app-openpgp.c (parse_algorithm_attribute): Return the error.
+	(change_keyattr): Follow the change.
+	(app_select_openpgp): Handle the error of parse_algorithm_attribute.
+
+2022-07-12  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Don't inhibit SSH authentication for larger data if it can.
+	+ commit 07e43eda8dc69cecc385a6b3723e155afbc59257
+	* scd/app-openpgp.c (do_auth): Use command chaining if available.
+
+2022-07-06  Werner Koch  <wk@gnupg.org>
+
+	Release 2.3.36.
+	+ commit 491645b50ec97db12520483d347291d660db209c
+
+
+2022-06-29  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: New short options -V and -X.
+	+ commit f357a5f239919de976b86a666410f504682973e4
+	* tools/gpgconf.c: Assign short options -X and -V
+	(show_version_gnupg): Print the vsd version if available.
+
+2022-06-24  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Flush before calling ftruncate.
+	+ commit 9e2307ddf0c2608e9cfb435f870b75cbb35791d7
+	* agent/findkey.c (write_extended_private_key): Make sure
+	it is flushed out.
+
+2022-06-21  Werner Koch  <wk@gnupg.org>
+
+	sm: Update pkcs#12 module from master.
+	+ commit 4c14bbf56fb544541bd65f9d6e6e0b81779dcab6
+	* sm/minip12.c: Update from master.
+	* sm/import.c (parse_p12): Pass NULL for curve.
+
+2022-06-20  Werner Koch  <wk@gnupg.org>
+
+	common: Add an easy to use DER builder.
+	+ commit d21ced1e3596dc9e4fa53995286b4cbbd6e94195
+	* common/tlv-builder.c: New.
+	* common/tlv.c: Remove stuff only used by GnuPG 1.
+	(put_tlv_to_membuf, get_tlv_length): Move to ...
+	* common/tlv-builder.c: here.
+	* common/tlv.h (tlv_builder_t): New.
+
+2022-06-14  Werner Koch  <wk@gnupg.org>
+
+	g10: Fix garbled status messages in NOTATION_DATA.
+	+ commit 7b1db7192e6e4d0cfc439b23b13831837c85bc21
+	* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one
+
+2022-06-09  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent,scd: Make sure to set CONFIDENTIAL flag in Assuan.
+	+ commit aeee62593ae9147a38fd79f0782f3fa0e4ac5c4a
+	* agent/call-scd.c (inq_needpin): Call assuan_begin_confidential
+	and assuan_end_confidential, and wipe the memory after use.
+	* agent/command.c (cmd_preset_passphrase): Likewise.
+	* scd/command.c (pin_cb): Likewise.
+
+2022-06-03  Werner Koch  <wk@gnupg.org>
+
+	w32: Avoid warning about not including winsock2.h after windows.h.
+	+ commit dfc01118ce0707c2d920fb31f7731f3a383df761
+	* common/dynload.h: Include winsock2.h first.
+
+	w32: Allow Unicode filenames for iobuf_cancel.
+	+ commit 10db566489880acd510f8e07dc52a38dd82feafe
+	* common/iobuf.c (iobuf_cancel): Use gnupg_remove
+	* common/mischelp.c (same_file_p): Allow for Unicode names.
+
+2022-06-01  Werner Koch  <wk@gnupg.org>
+
+	scd:p15: Fix accidental commit of debug code.
+	+ commit e3db6c74a6305e86eaefb0ca8d49d4d9754104ff
+	* scd/app-p15.c (do_sign): Revert MSE setting.
+
+	scd: Shorten cardio debug output for all zeroes.
+	+ commit 62becf599eb861936faf88b6ec5e0f7b1658b54e
+	* scd/apdu.c (all_zero_p): New.
+	(send_le): Use it.
+
+	(cherry picked from commit 9b6f574928546e6905a92c3e74d72478f1585c66)
+
+2022-05-17  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Fix use of SCardListReaders for PC/SC.
+	+ commit 7bc794c3113400af082b26610d9d1305826be54e
+	* scd/apdu.c (open_pcsc_reader): Initialize NREADER.
+
+2022-05-10  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Add workaround for ECC attribute on Yubikey.
+	+ commit a5217c90003c2e1b9bfb06b58ffc2d0d9164f22a
+	* scd/app-openpgp.c (parse_algorithm_attribute): Skip possibly bogus
+	octet in a key attribute.
+
+2022-05-06  Werner Koch  <wk@gnupg.org>
+
+	scd:p15: Improve the displayed S/N for Technology Nexus cards.
+	+ commit 91acbdc93c8a6ae06b483a27c8bb7c33a978108d
+	* scd/app-p15.c (any_control_or_space_mem): New.
+	(get_dispserialno): Add new code.
+
+	scd:p15: Fix the the sanity check of the displayed S/N.
+	+ commit 8efe738c4a090f523461fa3055da668467715105
+	* scd/app-p15.c (any_control_or_space): Fix loop.
+
+2022-05-05  Werner Koch  <wk@gnupg.org>
+
+	scd:p15: Fix reading certificates without length info.
+	+ commit 7f029eef6ce15be4167f56e7fc07755d189e5e27
+	* scd/app-p15.c (readcert_by_cdf): Do not use extended mode if the CDF
+	object has no length info.  Add debug output when reading a cert.
+	(read_p15_info): No more need to disable extended mode for GeNUA cards.
+
+	scd: New debug flags "card".
+	+ commit d60f930d9b000e802dc61c8e8d494a3091dc0437
+	* scd/scdaemon.c (debug_flags): Add "card".
+	* scd/scdaemon.h (DBG_CARD_VALUE, DBG_CARD): New.
+
+	gpg: Minor robustness fix.
+	+ commit 36a5509e11c81305c4ded93982fa594bd52555a6
+	* g10/parse-packet.c (mpi_read_detect_0_removal): Protect agains
+	failed gcry_mpi_scan.
+
+2022-05-02  NIIBE Yutaka  <gniibe@fsij.org>
+
+	tests: Add a test for Ed25519 keys for non-protected secret.
+	+ commit 06e82e997a56406e04113a7f6c1d083e0cc04172
+	* tests/openpgp/issue5120.scm: New.
+
+2022-04-28  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: Handle leading-zeros private key for Ed25519.
+	+ commit 3fcef7371480cce392d690897d42955f1b19c12a
+	* g10/parse-packet.c (mpi_read_detect_0_removal): New.
+	(parse_key): Use mpi_read_detect_0_removal for PUBKEY_ALGO_EDDSA
+	to tweak the checksum.
+
+	Revert "gpg: Accept Ed25519 private key in SOS which reserves leading zeros."
+	+ commit 3192939a10df17cb9666773ed8888627f6d16b8d
+	This reverts commit 14de7b1e5904e78fcbe413a82d0f19b750bd8830.
+
+2022-04-25  Werner Koch  <wk@gnupg.org>
+
+	Release 2.2.35.
+	+ commit f7bc6f50496bffc3c377cb4e3e844242a590b5e1
+
+
+	gpg: Avoid NULL ptr access due to corrupted packets.
+	+ commit 86d84464ae11666b1556e876a41a65cec8daaf18
+	* g10/parse-packet.c (parse_signature): Do not create an opaque MPI
+	with NULL and length > 0
+	(parse_key): Ditto.
+
+2022-04-25  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Not writing password into file.
+	+ commit 9c0a24b4a55edff3d54cc5e98ba8112714f583e3
+	* agent/genkey.c (do_check_passphrase_pattern): Use stream to invoke
+	pattern check program.
+
+2022-04-25  Werner Koch  <wk@gnupg.org>
+
+	gpg: Emit an ERROR status as hint for a bad passphrase.
+	+ commit f021ecd57624f09430731f5deee2c4d0712150c8
+	* g10/mainproc.c (proc_symkey_enc): Issue new error code.
+	(proc_encrypted): Ditto.
+
+2022-04-20  Werner Koch  <wk@gnupg.org>
+
+	w32: Do no use Registry item DefaultLogFile for the main tools.
+	+ commit a5faaf8bee43e1e8d99cf3c08fad8ccce047fc28
+	* g10/gpg.c (main): Set LOG_NO_REGISTRY.
+	* sm/gpgsm.c (main): Ditto.
+	* tools/gpg-connect-agent.c (main): Ditto.
+	* tools/gpgconf.c (main): Ditto.
+	(show_other_registry_entries): Print "DefaultLogFile".
+
+2022-04-14  Werner Koch  <wk@gnupg.org>
+
+	gpg: Replace an assert by a log_fatal.
+	+ commit c8c71fc7161bf6b553bc5b45b2f7a06f8a1a4639
+	* g10/build-packet.c (do_signature): Use log_fatal.
+
+	scd: Minor code reorganization.
+	+ commit 58532fe56c334d0edc589311e6601fb9da70d9a1
+	* scd/ccid-driver.c: Move struct defines to the top.
+	(MAX_DEVICE): Rename to CCID_MAX_DEVICE.
+
+	scd: Fix memory leak in ccid-driver.
+	+ commit c4b14be48fe9b0f52bca9840375eb0eac3cc2432
+	* scd/ccid-driver.c (ccid_dev_scan): Use loop var and not the count.
+
+2022-04-13  Werner Koch  <wk@gnupg.org>
+
+	scd:p15: Improve the PIN prompt for Genua cards.
+	+ commit e99670f944bc613d258d0810c5831a2099718d4e
+	* scd/app-p15.c (CARD_PRODUCT_GENUA): New.
+	(cardproduct2str): Add it.
+	(read_p15_info): Detect and set GENUA
+	(make_pin_prompt): Take holder string from the AODF.
+
+	scd:p15: Support for GeNUA cards.
+	+ commit 44ec383cdec06ee4ac8dbe7b913990bbeeb3d3a3
+	* scd/app-p15.c (read_p15_info): Disable extended mode for Genua
+	cards.
+
+	scd:p15: Prepare AODF parsing for other authentication types.
+	+ commit 29fd80581867beeec068b49e8587762394e7d4d1
+	* 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.
+
+	scd:p15: Add basic support for AET JCOP cards.
+	+ commit 80cf64c65155f718ed7dcee0e6a2aedbd9a2a5b0
+	* 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 extended mode for AET.
+	(app_select_p15): Set no_extended_mode.
+	---
+	(cherry picked from commit 544ec7872aed24c296ea34fac777eca287f7bb47)
+
+2022-03-29  NIIBE Yutaka  <gniibe@fsij.org>
+
+	common,unix: Backport dotlock changes from GnuPG 2.3.
+	+ commit d9a8d3353afd669252e25b56ed92f9fb7c0dcc3d
+	* common/dotlock.c (read_lockfile): Return FD in R_FD.
+	(dotlock_take_unix): Fix a race condition by new read_lockfile and
+	checking with fstat.  Describe one race condition in comment.
+	(dotlock_release_unix): Follow the change of read_lockfile.
+
+2022-03-28  Werner Koch  <wk@gnupg.org>
+
+	dirmngr: Escape more characters in WKD requests.
+	+ commit 3b251c8366cf7ddf5b82fc2331a8009fa1f2de23
+	* dirmngr/server.c (proc_wkd_get): Also escape '#' and '+'
+
+2022-03-22  Werner Koch  <wk@gnupg.org>
+
+	gpgtar: New option --with-log.
+	+ commit ce69d55f70a18cfe5cf91353efc00ab43ba8fd8b
+	* tools/gpgtar.c: New option --with-log.
+	* tools/gpgtar.h (opt): Add field with_log.
+	* tools/gpgtar-extract.c (gpgtar_extract): Move directory string
+	building up.  Add option --log-file if needed.
+	* tools/gpgtar-create.c (gpgtar_create): Make tmpbuf static becuase it
+	is used outside of its scope.
+	* tools/gpgtar-list.c (gpgtar_list): Ditto.
+
+2022-03-21  Werner Koch  <wk@gnupg.org>
+
+	dirmngr: Make WKD_GET work even for servers not handling SRV RRs.
+	+ commit 6d30fb6940d57237392f9196a4de5c7246ffefdf
+	* dirmngr/server.c (proc_wkd_get): Take care of DNS server failures
+
+	gpgtar: Finally use a pipe for decryption.
+	+ commit d431feb3077f763e37f824026988a10d87c8a5aa
+	* tools/gpgtar.h (opt): Add new flags.
+	* tools/gpgtar.c: new options --batch, --yes, --no, --status-fd, and
+	--require-compliance.
+	(main): Init signals.
+	* tools/gpgtar-create.c: Add new header files.
+	(gpgtar_create): Rework to use a pipe for encryption and signing.
+	* tools/gpgtar-list.c: Add new header files.
+	(gpgtar_list): Rework to use a pipe for decryption.
+	* tools/gpgtar-extract.c: Add new header files.
+	(gpgtar_extract): Rework to use a pipe for decryption.
+
+2022-03-18  Werner Koch  <wk@gnupg.org>
+
+	gpg: Print info about the used AEAD algorithm.
+	+ commit 15eda7ce783a81d2f5911028a4c8c3ce5649edca
+	* g10/misc.c (openpgp_cipher_algo_mode_name): New.
+	* g10/decrypt-data.c (decrypt_data): Use function here.
+
+	common: New function map_static_strings.
+	+ commit c1453665491fb6a16883ee5e1828cfb0c28b466a
+	* common/mapstrings.c (struct intmapping_s): New.
+	(map_static_strings): New.
+	* common/stringhelp.c (do_strconcat): Rename to ...
+	(vstrconcat): this and make global.
+
+	* common/t-mapstrings.c (test_map_static_strings): New test.
+
+	gpg: Allow decryption of symencr even for non-compliant cipher.
+	+ commit e081a601f7b31fa278e46de7c6834a756b63cec2
+	* g10/decrypt-data.c (decrypt_data): Add arg compliance_error.  Adjust
+	all callers.  Fail on compliance error only in --require-compliance
+	mode.  Make sure to return an error if the buffer is missing; actually
+	that should be an assert.
+	* g10/mainproc.c (proc_encrypted): Delay printing of the compliance
+	mode status.  Consult the compliance error now returned by
+	decrypt_data.
+
+2022-03-15  Werner Koch  <wk@gnupg.org>
+
+	common: New flags for gnupg_spawn_process.
+	+ commit 7ba44d15ca2f800c402a56eb71bb524f91ea2ffa
+	* common/exechelp.h (GNUPG_SPAWN_KEEP_STDIN): New.
+	(GNUPG_SPAWN_KEEP_STDOUT): New.
+	(GNUPG_SPAWN_KEEP_STDERR): New.
+	* common/exechelp-posix.c (do_exec): Add arg flags and implement new
+	flags.
+	* common/exechelp-w32.c (gnupg_spawn_process): Implement new flags.
+
+2022-03-09  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: Silence warnings from parsing the options files.
+	+ commit e8b1ab1d2d22f938b3e5991343b7e089d96606a0
+	* tools/gpgconf-comp.c (retrieve_options_from_program): Set verbose
+	flag for the arg parser only in --verbose mode.
+
+2022-03-09  NIIBE Yutaka  <gniibe@fsij.org>
+
+	sm: Fix parsing encrypted data.
+	+ commit 0c7dffe99d3fded41df87512063515b5ca2da820
+	* sm/minip12.c (cram_octet_string): Finish when N==0.
+	(parse_bag_encrypted_data): Support constructed data with multiple
+	octet strings.
+
+2022-03-08  Werner Koch  <wk@gnupg.org>
+
+	gpgsm: New option --require-compliance.
+	+ commit 847d618454e6f8418b169132dbdd0307d9b4d7e0
+	* sm/gpgsm.c (oRequireCompliance): New.
+	(opts): Add --require-compliance.
+	(main): Set option.
+	* sm/gpgsm.h (opt): Add field require_compliance.
+	(gpgsm_errors_seen): Declare.
+	* sm/verify.c (gpgsm_verify): Emit error if non de-vs compliant.
+	* sm/encrypt.c (gpgsm_encrypt): Ditto.
+	* sm/decrypt.c (gpgsm_decrypt): Ditto.
+
+	gpg: New option --require-compliance.
+	+ commit 17890d43187384d049d80af28a5baea8613ff6ea
+	* g10/options.h (opt): Add field flags.require_compliance.
+	* g10/gpg.c (oRequireCompliance): New.
+	(opts): Add --require-compliance.
+	(main): Set option.
+	* g10/mainproc.c (proc_encrypted): Emit error if non de-vs compliant.
+	(check_sig_and_print): Ditto.
+	* g10/encrypt.c (encrypt_crypt): Ditto.
+
+	gpg: Give Libgcrypt CFLAGS a higher priority than SQlite.
+	+ commit c11292fe736db6e61fad17d74f65b0b5ad9c2808
+	* g10/Makefile.am (AM_CFLAGS): Reorder.
+
+2022-03-04  Werner Koch  <wk@gnupg.org>
+
+	gpgtar,w32: Support file names longer than MAX_PATH.
+	+ commit 5492079defab85b1ba2c583e32a8feb752314b2e
+	* tools/gpgtar.c: Replace assert by log_assert.
+	* tools/gpgtar-extract.c: Ditto.
+	(extract_regular): Create files with sysopen flag.
+	* tools/gpgtar-create.c (scan_directory): Use gpgrt_fname_to_wchar.
+
+	common,w32: Support file names longer than MAX_PATH in iobuf.
+	+ commit 4122896a39b7ac5dc071bf4d2e9be0ac8a3e21d7
+	* common/iobuf.c (direct_open): Use gpgrt_fname_to_wchar.
+	(any8bitchar): Remove.
+
+2022-02-24  Jussi Kivilinna  <jussi.kivilinna@iki.fi>
+
+	g10: Avoid extra hash contexts when decrypting MDC input.
+	+ commit 9116fd1e9a2da9c83f94acfe41fb6e5c6f03e8d1
+	* g10/mainproc.c (mainproc_context): New member
+	'seen_pkt_encrypted_mdc'.
+	(release_list): Clear 'seen_pkt_encrypted_mdc'.
+	(proc_encrypted): Set 'seen_pkt_encrypted_mdc'.
+	(have_seen_pkt_encrypted_aead): Rename to...
+	(have_seen_pkt_encrypted_aead_or_mdc): ...this and add check for
+	'seen_pkt_encrypted_mdc'.
+	(proc_plaintext): Do not enable extra hash contexts when decrypting
+	MDC input.
+
+2022-02-21  Werner Koch  <wk@gnupg.org>
+
+	scd:p15: Used extended mode already for RSA 2048.
+	+ commit a2db490de5473af42d7b5a99398c48befe294394
+	* scd/app-p15.c (do_sign, do_decipher): Replace GT by GE.
+
+2022-02-17  NIIBE Yutaka  <gniibe@fsij.org>
+
+	tests: Remove a test case with "quiet" option with gpgconf.
+	+ commit f064d972e38863358a2dd53de43acd66572830c2
+	* tests/openpgp/gpgconf.scm: Remove "quiet" test.
+
+	scd: Use lock_slot for apdu_send_direct.
+	+ commit 3c3765405de02b9a57fdc9a3cf901f6e3aca8586
+	* scd/apdu.c (apdu_send_direct): Use lock_slot.
+
+2022-02-09  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: Do not show "quiet" as option.
+	+ commit 2f2130ff24faf4507fa5949e834c155b4a8e1525
+	* tools/gpgconf-comp.c: Remove "quiet" and two unsupported options
+
+2022-02-07  Werner Koch  <wk@gnupg.org>
+
+	Release 2.2.34.
+	+ commit 04d40a680baa43f9803d0981b1da49144021d723
+
+
+	dirmngr: Changes to the linking order.
+	+ commit 3c79ff34c417bfc392008eca1970b86bec54d6c3
+	* dirmngr/Makefile.am: Tweak library order.
+
+	gpgconf: Make gpgconf --launch dirmngr work again.
+	+ commit 5a7ed6dd8f1b4e3c2e8f6e82700a86bd886c5f50
+	* tools/gpgconf.h (gc_component_id_t): Fix the order.
+
+	gpgconf: Print the used code pages on Windows with --show-configs.
+	+ commit 32b364b99b492c580330591640cdaa7407016733
+	* tools/gpgconf.c (show_configs): Add some code
+
+	common: Fix creation of Windows socket directories.
+	+ commit 7d1215cb9cba258102b91c92e6973783e8d53b07
+	* common/homedir.c (w32_try_mkdir): Remove.
+	(standard_homedir): Use gnupg_mkdir instead of w32_try_mkdir.
+	(_gnupg_socketdir_internal): Ditto.
+
+2022-02-04  Werner Koch  <wk@gnupg.org>
+
+	m4: Update our library m4 files from master.
+	+ commit c8cd66ae7e609f221c7dad905e88a206a285ab1c
+	* m4/gpg-error.m4: Updated
+	* m4/ksba.m4: Updated
+	* m4/libassuan.m4: Updated
+	* m4/libgcrypt.m4: Updated
+	* m4/npth.m4: Updated
+	* m4/ntbtls.m4: Updated
+
+2022-02-03  Werner Koch  <wk@gnupg.org>
+
+	dirmngr: Allow building with non-standard ntbtls location.
+	+ commit 137590fd8614a69cc60da3226cefc4495502ec26
+	* dirmngr/Makefile.am: Add missing -L and -I
+
+	dirmngr: Simplify --gpgconf-list output.
+	+ commit 0b76ef48e1df4c210d57f3bf4bc1fe1fa3762408
+	* dirmngr/dirmngr.c (main): Keep only values with the default flag.
+
+	sm: New option --ignore-cert-with-oid.
+	+ commit bcf446b70ca58ac1497269f047fba9ddb3d62e96
+	* sm/gpgsm.c (oIgnoreCertWithOID): New.
+	(opts): Add option.
+	(main): Store its value.
+	* sm/call-agent.c (learn_cb): Test against that list.
+
+2022-02-02  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: Return the compliance_de_vs item.
+	+ commit e058d15d2d56dfed2723e1a55c75e52db87b2dc2
+	* tools/gpgconf-comp.c (known_options_gpg): Add missing pseudo option.
+
+2022-02-01  Werner Koch  <wk@gnupg.org>
+
+	dirmngr: Avoid initial delay on the first keyserver access.
+	+ commit dde88897e2c5851aab32370ee6c8ace150debb77
+	* dirmngr/dirmngr.c (dirmngr_never_use_tor_p): New.
+	* dirmngr/server.c (ensure_keyserver): Don't even test for the Tor
+	proxy in never-use-tor Mode.
+
+	* tools/gpgtar-create.c: Include unistd.h to avoid a warning on
+	Windows.
+
+	gpg: Set --verbose and clear --quiet in debug mode.
+	+ commit d426ed66ac043e442649a8a2bc7eac6753a5bf58
+	* g10/gpg.c (set_debug): Tweak options.
+
+2022-01-28  Werner Koch  <wk@gnupg.org>
+
+	ssh: Fix adding an ed25519 key with a zero length comment.
+	+ commit 2331900d1cc022c04177272a51c00690229bb989
+	* agent/command-ssh.c (sexp_key_construct): Do not put an empty string
+	into an S-expression.
+	(stream_read_string): Do not not try to a read a zero length block.
+
+2022-01-27  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: Tweak the use of ldapserver.
+	+ commit e1fc053dc1ad260922428cf864071e829e6c30f2
+	* tools/gpgconf-comp.c (known_options_gpgsm): Make "keyserver"
+	invisible.
+	(known_options_dirmngr): Add "ldapserver".
+	* sm/gpgsm.c (oKeyServer_deprecated): New.
+	(opts): Assign "ldapserver" to the new option and makr it as obsolete.
+
+2022-01-26  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: Some more fixes for the backported stuff.
+	+ commit eefa2d19ee3f359435f0e5324cb5f10f2d8940a5
+	* agent/gpg-agent.c (main) <gpgconf_list>: Keep only those option which
+	have a default.  Remove runtime flag.
+	* common/gc-opt-flags.h (GC_OPT_FLAG_RUNTIME): Move to ...
+	* tools/gpgconf-comp.c: here because it is now inetrnal to gpgconf.
+	(known_options_gpg_agent): Add a few missing runtime flags.  Remove
+	"options".  Add "check-sym-passphrase-pattern".
+	(known_options_scdaemon, known_options_gpgsm): Remove "options".
+	(dirmngr): Ditto.
+
+	* tools/gpgconf-comp.c (is_known_option): Return only options having a
+	value for name.  Thus we list list options from the known_options
+	tables.
+
+	gpgconf: Fix --list-options for forced options.
+	+ commit 85300587cc8a115c96e812850762090f937ade9b
+	* tools/gpgconf-comp.c: Remove assert.h and replace all assert calls
+	by log_assert.
+	(known_options_gpg): Add "keyserver" as invisible.  Remove "options".
+	(known_pseudo_options_gpg, known_pseudo_options_gpgsm): New.
+	(gc_component): Add field known_pseudo_options.
+	(struct read_line_wrapper_parm_s): New.
+	(read_line_wrapper): New.
+	(retrieve_options_from_program): Use read_line_wrapper to handle
+	pseudo options.
+	(retrieve_options_from_program): Ignore to be ignored options.  Add
+	failsafe code to avoid calling percent_escape with NULL.
+
+2022-01-25  Werner Koch  <wk@gnupg.org>
+
+	common: Fix returning of option attributes for options with args.
+	+ commit d8e6d1e9ed7d181f546426269ab7b04e184bb9a1
+	* common/argparse.c (gnupg_argparse): Set attribute flags
+
+	scd: Also prefer Yubikeys if no reader port is given.
+	+ commit 38c666ec3fdb0e3a8762889ae99faca4adb68b68
+	* scd/apdu.c (select_a_reader): Extend the white list.
+
+2022-01-17  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: Fix adding the list of ultimate trusted keys.
+	+ commit 4cc724639c012215f59648cbb4b7631b9d352e36
+	* g10/keygen.c (do_generate_keypair): Remove call to
+	register_trusted_keyid for updating user_utk_list.
+	* g10/trust.c (register_trusted_keyid): Remove.
+	(update_ownertrust): Add call to tdb_update_utk.
+	* g10/trustdb.c (tdb_register_trusted_keyid): Make it internal
+	function by adding "static" qualifier.
+	Replace calls of register_trusted_keyid to tdb_register_trusted_keyid.
+	(tdb_update_utk): New.
+	* g10/trustdb.h (tdb_update_utk): New.
+
+2022-01-12  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: Add command aliases -L -K -R.
+	+ commit f16c535eee912224a44b5999df7915c69f2d41bc
+	* tools/gpgconf.c (enum cmd_and_opt_values): Assign shortcuts.
+
+	common,w32: Improve HKCU->HKLM fallback.
+	+ commit 96db487a4da5903b71c64edf7a0ee9c2e01a8762
+	* common/w32-reg.c (read_w32_registry_string): Add another fallback.
+
+2022-01-10  Werner Koch  <wk@gnupg.org>
+
+	gpgtar: List and extract using extended headers.
+	+ commit bf4cf04a54bb2aa34afdf1d3c814ca4e185bacc8
+	* tools/gpgtar.h (TF_EXTHDR, TF_GEXTHDR): New.
+	* tools/gpgtar-list.c (parse_header): Set the new type flags.
+	(parse_extended_header): New.
+	(read_header): Add arg r_extheader and parse extended header.
+	(print_header): Consult the extended header.
+	(gpgtar_list): Pass an extended header object.
+	(gpgtar_read_header): Ditto.
+	(gpgtar_print_header): Ditto.
+	* tools/gpgtar-extract.c (extract): New arg exthdr and factor name
+	checking out to ...
+	(check_suspicious_name): new.
+	(extract_regular): Add arg exthdr and consult it.
+	(extract_directory): Likewise.
+	(gpgtar_extract): Provide extheader object.
+
+	gpgtar: Create extended header for long file names.
+	+ commit ec69ceab2615758e88c52a1d30c4731b3e71b105
+	* tools/gpgtar-create.c (global_header_count): new.
+	(myreadlink): New.
+	(build_header): New arg r_exthdr.  Detect and store long file and link
+	names.  Factor checkum computation out to ...
+	(compute_checksum): new.
+	(add_extended_header_record): New.
+	(write_extended_header): New.
+	(write_file): Write extended header.
+
+2021-12-30  Werner Koch  <wk@gnupg.org>
+
+	build: Fixes recent commits to still build with gpgrt 1.27.
+	+ commit c4153f7021afafe9ce4459aa08857136b394cce7
+	* agent/gpg-agent.c (main): Use gnupg_argparse.
+	* tools/gpgconf-comp.c: Use gnupg_opt_t.
+	* tools/gpgconf.c (show_version_gnupg): Use strusage.
+
+	gpgconf: Do not list ignored options and mark forced options as r/o.
+	+ commit c69c51bce0f07bf1becdb944a422bdc563705dae
+	* tools/gpgconf-comp.c (list_one_option): Skip ignored options and set
+	the no_change flag for forced options.
+	(retrieve_options_from_program): Put the attributes into the option
+	table.
+
+2021-12-29  Werner Koch  <wk@gnupg.org>
+
+	gpg: Re-group the options in the --help output.
+	+ commit f7bde071ccc8583b58ddaafa42e997e9202b041f
+	* g10/gpg.c (opts): Change oLoadExtensions, oStrict, and oNoStrict to
+	use ARGPARSE_ignore and remove the code in the option switch.
+
+	agent: Re-group the options in the --help output.
+	+ commit 7e535503a9c637007a933a77e4bc674c8fb6dfea
+	* agent/gpg-agent.c (oGreeting): Remove non existant dummy option.
+
+	gpgconf: Take care of --homedir when reading/updating options.
+	+ commit 5934027115239cb7b39659f14f7a1dfecada6b76
+	* tools/gpgconf-comp.c (gpg_agent_runtime_change): Remove unused var.
+	(scdaemon_runtime_change): Ditto.
+	(dirmngr_runtime_change): Ditto.
+	(gc_component_check_options): Pass --homedir if needed.
+	(retrieve_options_from_program): Take care of --homedir.
+
+	gpgconf: Rewrite the gpgconf-comp module.
+	+ commit 7a3a1ef3707194e1086c452d005319c519905d3e
+	* tools/gpgconf.h (gc_component_t): Change type to ...
+	(gc_component_id_t): this.
+	(GC_COMPONENT_ANY): New, so that we can use that in gpgconf-comp.c
+	directly.
+	* tools/gpgconf-comp.c: Major rework.
+
+	gpgconf: Support reading global options (part 2).
+	+ commit 5f890f417f135e237074c8a454e6a73e66d7b78d
+	* tools/gpgconf-comp.c: Remove all regular option descriptions.  They
+	are now read in from the component.  Also remove a few meanwhile
+	obsolete options.
+	* agent/gpg-agent.c: Add option description which were only set in
+	gpgconf-comp.c.
+	* dirmngr/dirmngr.c: Ditto.
+	* scd/scdaemon.c: Ditto.
+	* sm/gpgsm.c: Ditto.
+	* g10/gpg.c: Ditto.
+
+	gpgconf: Support reading global options (part 1).
+	+ commit 7397872445d6d2b8c9ef25e0108e603baa5478de
+	* tools/gpgconf.c (main): Set the config directories.
+	* tools/gpgconf-comp.c (gc_backend): Change the name of the config
+	files.
+	(struct gc_option): Add new field 'attr'.
+	(retrieve_options_from_program): Rewrite to use gpgrt_argparser.
+
+	common: New function xreallocarray.
+	+ commit f0d034ebf4fc299c2a6097248f51c329e65d2976
+	* common/miscellaneous.c (gnupg_reallocarray): New.
+	(xreallocarray): New.
+
+2021-12-13  Werner Koch  <wk@gnupg.org>
+
+	common,w32: Sync read_w32_registry_string with the gpgrt version.
+	+ commit 1af559a9a24fd930094ab7b466ed051cdbc66f99
+	* common/w32-reg.c (get_root_key): Add short version of the root
+	classes.
+
+2021-12-07  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: Accept Ed25519 private key in SOS which reserves leading zeros.
+	+ commit 14de7b1e5904e78fcbe413a82d0f19b750bd8830
+	* g10/parse-packet.c (sos_read): Backport from 2.3.
+	(parse_key): Use sos_read for Ed25519 private key.
+
 2021-11-23  Werner Koch  <wk@gnupg.org>
 
 	Release 2.2.33.
diff --git a/Makefile.in b/Makefile.in
index 2e3f0ed..82c7441 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -319,6 +319,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/NEWS b/NEWS
index 60c7174..800e9d6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,178 @@
+Noteworthy changes in version 2.2.37 (2022-08-24)
+-------------------------------------------------
+
+  * gpg: In de-vs mode use SHA-256 instead of SHA-1 as implicit
+    preference.  [T6043]
+
+  * gpg: Actually show symmetric+pubkey encrypted data as de-vs
+    compliant.  Add extra compliance checks for symkey_enc packets.
+    [T6119]
+
+  * gpg: Request keygrip of key to be added via command-fd interface.
+    [T5771]
+
+  * gpg: Look up user ID to revoke by UID hash.  [T5936]
+
+  * gpg: Fix wrong error message for "keytocard".  [T6122]
+
+  * gpg: --card-status shows the application type for non-openpgp
+    cards again.  [rG8e393e2592]
+
+  * gpg: The options --auto-key-import and --include-key-block are
+    again listed by gpgconf.  [T6138]
+
+  * gpgsm: New option --compatibility-flags.  [rG77b6896f7a]
+
+  * agent: New options --no-user-trustlist and --sys-trustlist-name.
+    [T5990]
+
+  * agent: Track and update the Display-S/N of cards so that the
+    "please insert card" prompt may now show more information.  Use
+    "gpg --card-status" to update stored card meta data.  [T6135]
+
+  * scd:openpgp: Fix problem with ECC algorithm attributes on
+    Yubikeys.  [rG225c66f13b87]
+
+  * scd:openpgp: Fix problem with Yubikey 5.4 firmware.  [T6070]
+
+  * dirmngr: Ask keyservers to provide the key fingerprints.  [T5741]
+
+  * ssh: Allow authentication as used by OpenSSH's PQ crypto support.
+    [T5935]
+
+  * wkd: Fix path traversal attack in gpg-wks-server.  Add the mail
+    address to the pending request data.  [rGc1489ca0e1, T6098]
+
+  * gpgconf: Improve registry dumping.  [rG6bc9592318]
+
+  * Silence warnings from AllowSetForegroundWindow.  [rG6583abedf3]
+
+  Release-info: https://dev.gnupg.org/T6105
+
+
+Noteworthy changes in version 2.2.36 (2022-07-06)
+-------------------------------------------------
+
+  * g10: Fix possibly garbled status messages in NOTATION_DATA.  This
+    bug could trick GPGME and other parsers to accept faked status
+    lines.  [T6027, CVE-2022-34903]
+
+  * gpg: Handle leading zeroes in Ed25519 private keys and reverse
+    change regarding Ed25519 SOS encoding as introduced with 2.2.34.
+    [T5120]
+
+  * gpg: Allow Unicode file names for iobuf_cancel under Windows.
+
+  * gpgsm: Improve pkcs#12 import.  [T6037,T5793,T4921,T4757]
+
+  * scd,p15: Fix reading certificates w/o length info.
+
+  * scd,p15: Improve the displayed S/N for Technology Nexus cards.
+
+  * scd,openpgp: Add workaround for ECC attribute on Yubikey. [T5963]
+
+  * scd: Fix use of SCardListReaders for PC/SC.  [T5979]
+
+  * gpgconf: New short options -X and -V.
+
+  * Make sure to always set CONFIDENTIAL flag in Assuan.  [T5977]
+
+  Release-info: https://dev.gnupg.org/T5949
+
+
+Noteworthy changes in version 2.2.35 (2022-04-25)
+-------------------------------------------------
+
+  * gpg,gpgsm: New option --require-compliance.  [17890d4318]
+
+  * gpgtar: New option --with-log.  [rGce69d55f70]
+
+  * gpg: Threefold decryption speedup for large files.
+    [T5820,rG9116fd1e9a]
+
+  * gpgtar: Support file names longer than MAX_PATH.  [rG5492079def]
+
+  * scdaemon: Add support for GeNUA cards.  [rG44ec383cde]
+
+  * gpg: Allow decryption of symmetric encrypted data even for
+    non-compliant cipher.  [rGe081a601f7]
+
+  * gpg: Avoid possible race condition in --edit-card/factory-reset.
+    [T5831]
+
+  * gpg: Emit an ERROR status as hint for a bad passphrase.  [T5943]
+
+  * gpg: Avoid NULL-ptr access due to corrupted packets.  [T5940]
+
+  * gpgsm: Fix parsing of certain PKCS#12 files.  [T5793]
+
+  * gpgtar: Use a pipe for decryption and thus avoid memory
+    exhaustion.  [rGd431feb307]
+
+  * scdaemon: Use extended mode for pkcs#15 already for rsa2048.
+    [rGa2db490de5]
+
+  * dirmngr: Make WKD lookups work for resolvers not handling SRV
+    records.  [T4729]
+
+  * dirmngr: Escape more characters in WKD requests.  [T5902]
+
+  * gpgconf: Silence warnings from parsing the option files.  [T5874]
+
+  * Improve removing of stale lockfiles under Unix.  [T5884]
+
+  Release-info: https://dev.gnupg.org/T5928
+
+
+Noteworthy changes in version 2.2.34 (2022-02-07)
+-------------------------------------------------
+
+  * gpgconf: Backport the improved option reading and writing code
+    from 2.3.  [rG7a3a1ef370,T4788]
+
+  * gpgconf: Do not list ignored options and mark forced options as
+    read-only.  [T5732]
+
+  * gpgconf: Correctly show registry entries with --show-configs.
+    [T5724]
+
+  * gpgconf: Add command aliases -L, -K, and -R.  [rGf16c535eee]
+
+  * gpgconf: Tweak the use of the ldapserver option.  [T5801]
+
+  * gpgconf: Make "--launch gpg-agent" work again.  [rG5a7ed6dd8f]
+
+  * gpg: Accept Ed25519 private keys in modernized encoding.  [T5120]
+
+  * gpg: Fix adding the list of ultimate trusted keys.  [T5742]
+
+  * gpgsm: New option --ignore-cert-with-oid.  [rGbcf446b70c]
+
+  * dirmngr: Avoid initial delay on the first keyserver access in
+    presence of --no-use-tor.  [rGdde88897e2]
+
+  * scdaemon: Also prefer Yubikeys if no reader port is given.
+    [rG38c666ec3f]
+
+  * agent: Make missing strings translatable and update German and
+    Japanese translations.  [T4777]
+
+  * ssh: Fix adding an ed25519 key with a zero length comment.  [T5794]
+
+  * gpgtar: Create and handle extended headers to support long file
+    names.  [T5754]
+
+  * Fix the creation of socket directories under Windows for non-ascii
+    account names.  [rG7d1215cb9c]
+
+  * Improve the registry HKCU->HKLM fallback.  [rG96db487a4d]
+
+  * Prettify the --help output of most commands.
+
+  Release-info: https://dev.gnupg.org/T5703
+  See-also: gnupg-announce/2022q1/000470.html
+
+
 Noteworthy changes in version 2.2.33 (2021-11-23)
 -------------------------------------------------
 
diff --git a/README b/README
index c394c91..1ff3f5f 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@
 
           Copyright 1997-2019 Werner Koch
           Copyright 1998-2021 Free Software Foundation, Inc.
-          Copyright 2003-2021 g10 Code GmbH
+          Copyright 2003-2022 g10 Code GmbH
 
 
 * INTRODUCTION
diff --git a/VERSION b/VERSION
index 6616856..5a73918 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.33
+2.2.37
diff --git a/agent/Makefile.in b/agent/Makefile.in
index 1e9bc1a..ab8735f 100644
--- a/agent/Makefile.in
+++ b/agent/Makefile.in
@@ -364,6 +364,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/agent/agent.h b/agent/agent.h
index d84bb95..56e13ec 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -36,6 +36,7 @@
 #include "../common/sysutils.h" /* (gnupg_fd_t) */
 #include "../common/session-env.h"
 #include "../common/shareddefs.h"
+#include "../common/name-value.h"
 
 /* To convey some special hash algorithms we use algorithm numbers
    reserved for application use. */
@@ -148,6 +149,13 @@ struct
      interactively mark certificate in trustlist.txt as trusted. */
   int allow_mark_trusted;
 
+  /* Only use the system trustlist.  */
+  int no_user_trustlist;
+
+  /* The standard system trustlist is SYSCONFDIR/trustlist.txt.  This
+   * option can be used to change the name.  */
+  const char *sys_trustlist_name;
+
   /* If this global option is true, the Assuan command
      PRESET_PASSPHRASE is allowed.  */
   int allow_preset_passphrase;
@@ -422,7 +430,9 @@ gpg_error_t agent_modify_description (const char *in, const char *comment,
                                       const gcry_sexp_t key, char **result);
 int agent_write_private_key (const unsigned char *grip,
                              const void *buffer, size_t length, int force,
-                             time_t timestamp);
+                             time_t timestamp,
+                             const char *serialno, const char *keyref,
+                             const char *dispserialno);
 gpg_error_t agent_key_from_file (ctrl_t ctrl,
                                  const char *cache_nonce,
                                  const char *desc_text,
@@ -434,6 +444,8 @@ gpg_error_t agent_key_from_file (ctrl_t ctrl,
                                  char **r_passphrase);
 gpg_error_t agent_raw_key_from_file (ctrl_t ctrl, const unsigned char *grip,
                                      gcry_sexp_t *result);
+gpg_error_t agent_keymeta_from_file (ctrl_t ctrl, const unsigned char *grip,
+                                     nvc_t *r_keymeta);
 gpg_error_t agent_public_key_from_file (ctrl_t ctrl,
                                         const unsigned char *grip,
                                         gcry_sexp_t *result);
@@ -540,9 +552,11 @@ gpg_error_t s2k_hash_passphrase (const char *passphrase, int hashalgo,
                                  const unsigned char *s2ksalt,
                                  unsigned int s2kcount,
                                  unsigned char *key, size_t keylen);
-gpg_error_t agent_write_shadow_key (const unsigned char *grip,
+gpg_error_t agent_write_shadow_key (int maybe_update,
+                                    const unsigned char *grip,
                                     const char *serialno, const char *keyid,
-                                    const unsigned char *pkbuf, int force);
+                                    const unsigned char *pkbuf, int force,
+                                    const char *dispserialno);
 
 
 /*-- trustlist.c --*/
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 6438693..c5b95f4 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -737,7 +737,12 @@ inq_needpin (void *opaque, const char *line)
       rc = parm->getpin_cb (parm->getpin_cb_arg, parm->getpin_cb_desc,
                             line, pin, pinlen);
       if (!rc)
-        rc = assuan_send_data (parm->ctx, pin, pinlen);
+        {
+          assuan_begin_confidential (parm->ctx);
+          rc = assuan_send_data (parm->ctx, pin, pinlen);
+          assuan_end_confidential (parm->ctx);
+        }
+      wipememory (pin, pinlen);
       xfree (pin);
     }
   else if ((s = has_leading_keyword (line, "POPUPPINPADPROMPT")))
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 1ed5416..21dd53c 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -613,7 +613,7 @@ stream_read_string (estream_t stream, unsigned int secure,
         }
 
       /* Read data.  */
-      err = stream_read_data (stream, buffer, length);
+      err = length? stream_read_data (stream, buffer, length) : 0;
       if (err)
         goto out;
 
@@ -623,7 +623,7 @@ stream_read_string (estream_t stream, unsigned int secure,
     }
   else  /* Dummy read requested.  */
     {
-      err = stream_read_skip (stream, length);
+      err = length? stream_read_skip (stream, length) : 0;
       if (err)
         goto out;
     }
@@ -1725,6 +1725,11 @@ sexp_key_construct (gcry_sexp_t *r_sexp,
   estream_t format = NULL;
   char *algo_name = NULL;
 
+  /* We can't encode an empty string in an S-expression, thus to keep
+   * the code simple we use "(none)" instead.  */
+  if (!comment || !*comment)
+    comment = "(none)";
+
   if ((key_spec.flags & SPEC_FLAG_IS_EdDSA))
     {
       /* It is much easier and more readable to use a separate code
@@ -1744,7 +1749,7 @@ sexp_key_construct (gcry_sexp_t *r_sexp,
                                "(comment%s))",
                                curve_name,
                                mpis[0], mpis[1],
-                               comment? comment:"");
+                               comment);
       else
         err = gcry_sexp_build (&sexp_new, NULL,
                                "(public-key(ecc(curve %s)"
@@ -1752,7 +1757,8 @@ sexp_key_construct (gcry_sexp_t *r_sexp,
                                "(comment%s))",
                                curve_name,
                                mpis[0],
-                               comment? comment:"");
+                               comment);
+
     }
   else
     {
@@ -2489,8 +2495,13 @@ card_key_available (ctrl_t ctrl, gcry_sexp_t *r_pk, char **cardsn)
 
   if ( agent_key_available (grip) )
     {
+      char *dispserialno;
+
       /* (Shadow)-key is not available in our key storage.  */
-      err = agent_write_shadow_key (grip, serialno, authkeyid, pkbuf, 0);
+      agent_card_getattr (ctrl, "$DISPSERIALNO", &dispserialno);
+      err = agent_write_shadow_key (0, grip, serialno, authkeyid, pkbuf, 0,
+                                    dispserialno);
+      xfree (dispserialno);
       if (err)
         {
           xfree (pkbuf);
@@ -3148,7 +3159,8 @@ ssh_identity_register (ctrl_t ctrl, ssh_key_type_spec_t *spec,
 
   /* Store this key to our key storage.  We do not store a creation
    * timestamp because we simply do not know.  */
-  err = agent_write_private_key (key_grip_raw, buffer, buffer_n, 0, 0);
+  err = agent_write_private_key (key_grip_raw, buffer, buffer_n, 0, 0,
+                                 NULL, NULL, NULL);
   if (err)
     goto out;
 
diff --git a/agent/command.c b/agent/command.c
index e22e2fa..b682c55 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -995,6 +995,7 @@ cmd_readkey (assuan_context_t ctx, char *line)
   char *keyidbuf = NULL;
   size_t pkbuflen;
   int opt_card, opt_no_data;
+  char *dispserialno = NULL;
 
   if (ctrl->restricted)
     return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
@@ -1015,8 +1016,9 @@ 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"))
+      /* Hack to create the shadow key for the standard keys.  */
+      if ((!strcmp (keyid, "$SIGNKEYID") || !strcmp (keyid, "$ENCRKEYID")
+           || !strcmp (keyid, "$AUTHKEYID"))
           && !agent_card_getattr (ctrl, keyid, &keyidbuf))
         keyid = keyidbuf;
 
@@ -1037,13 +1039,23 @@ cmd_readkey (assuan_context_t ctx, char *line)
           goto leave;
         }
 
+      agent_card_getattr (ctrl, "$DISPSERIALNO", &dispserialno);
       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;
+          /* Shadow-key is not available in our key storage.  */
+          rc = agent_write_shadow_key (0, grip, serialno, keyid, pkbuf, 0,
+                                       dispserialno);
+        }
+      else
+        {
+          /* Shadow-key is available in our key storage but ne check
+           * whether we need to update it with a new display-s/n or
+           * whatever.  */
+          rc = agent_write_shadow_key (1, grip, serialno, keyid, pkbuf, 0,
+                                       dispserialno);
         }
+      if (rc)
+        goto leave;
 
       rc = opt_no_data? 0 : assuan_send_data (ctx, pkbuf, pkbuflen);
     }
@@ -1074,6 +1086,7 @@ cmd_readkey (assuan_context_t ctx, char *line)
   xfree (keyidbuf);
   xfree (serialno);
   xfree (pkbuf);
+  xfree (dispserialno);
   gcry_sexp_release (s_pkey);
   return leave_cmd (ctx, rc);
 }
@@ -2120,7 +2133,11 @@ cmd_preset_passphrase (assuan_context_t ctx, char *line)
 
       rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%zu", maxlen);
       if (!rc)
-	rc = assuan_inquire (ctx, "PASSPHRASE", &passphrase, &len, maxlen);
+        {
+          assuan_begin_confidential (ctx);
+          rc = assuan_inquire (ctx, "PASSPHRASE", &passphrase, &len, maxlen);
+          assuan_end_confidential (ctx);
+        }
     }
   else
     rc = set_error (GPG_ERR_NOT_IMPLEMENTED, "passphrase is required");
@@ -2129,7 +2146,10 @@ cmd_preset_passphrase (assuan_context_t ctx, char *line)
     {
       rc = agent_put_cache (ctrl, grip_clear, CACHE_MODE_ANY, passphrase, ttl);
       if (opt_inquire)
-	xfree (passphrase);
+        {
+	  wipememory (passphrase, len);
+          xfree (passphrase);
+        }
     }
 
 leave:
@@ -2418,11 +2438,11 @@ cmd_import_key (assuan_context_t ctx, char *line)
                            ctrl->s2k_count, -1);
       if (!err)
         err = agent_write_private_key (grip, finalkey, finalkeylen, force,
-                                       opt_timestamp);
+                                       opt_timestamp, NULL, NULL, NULL);
     }
   else
     err = agent_write_private_key (grip, key, realkeylen, force,
-                                   opt_timestamp);
+                                   opt_timestamp, NULL, NULL, NULL);
 
  leave:
   gcry_sexp_release (openpgp_sexp);
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c
index 1304686..78f2989 100644
--- a/agent/cvt-openpgp.c
+++ b/agent/cvt-openpgp.c
@@ -1069,7 +1069,8 @@ convert_from_openpgp_native (ctrl_t ctrl,
           if (!agent_protect (*r_key, passphrase,
                               &protectedkey, &protectedkeylen,
                               ctrl->s2k_count, -1))
-            agent_write_private_key (grip, protectedkey, protectedkeylen, 1, 0);
+            agent_write_private_key (grip, protectedkey, protectedkeylen,
+                                     1, 0, NULL, NULL, NULL);
           xfree (protectedkey);
         }
       else
@@ -1078,7 +1079,7 @@ convert_from_openpgp_native (ctrl_t ctrl,
           agent_write_private_key (grip,
                                    *r_key,
                                    gcry_sexp_canon_len (*r_key, 0, NULL,NULL),
-                                   1, 0);
+                                   1, 0, NULL, NULL, NULL);
         }
     }
 
diff --git a/agent/divert-scd.c b/agent/divert-scd.c
index 70a71e9..b9ea7e7 100644
--- a/agent/divert-scd.c
+++ b/agent/divert-scd.c
@@ -31,16 +31,51 @@
 #include "../common/i18n.h"
 #include "../common/sexp-parse.h"
 
+/* Replace all linefeeds in STRING by "%0A" and return a new malloced
+ * string.  May return NULL on memory error.  */
+static char *
+linefeed_to_percent0A (const char *string)
+{
+  const char *s;
+  size_t n;
+  char *buf, *p;
+
+  for (n=0, s=string; *s; s++)
+    if (*s == '\n')
+      n += 3;
+    else
+      n++;
+  p = buf = xtrymalloc (n+1);
+  if (!buf)
+    return NULL;
+  for (s=string; *s; s++)
+    if (*s == '\n')
+      {
+        memcpy (p, "%0A", 3);
+        p += 3;
+      }
+    else
+      *p++ = *s;
+  *p = 0;
+  return buf;
+}
 
+
+/* Ask for the card using SHADOW_INFO.  If GRIP is not NULL, the
+ * function also tries to find additional information from the shadow
+ * key file.  */
 static int
-ask_for_card (ctrl_t ctrl, const unsigned char *shadow_info, char **r_kid)
+ask_for_card (ctrl_t ctrl, const unsigned char *shadow_info,
+              const unsigned char *grip, char **r_kid)
 {
   int rc, i;
   char *serialno;
   int no_card = 0;
   char *desc;
   char *want_sn, *want_kid, *want_sn_disp;
+  int got_sn_disp_from_meta = 0;
   int len;
+  char *comment = NULL;
 
   *r_kid = NULL;
 
@@ -53,11 +88,62 @@ ask_for_card (ctrl_t ctrl, const unsigned char *shadow_info, char **r_kid)
       rc = gpg_error_from_syserror ();
       xfree (want_sn);
       xfree (want_kid);
+      xfree (comment);
       return rc;
     }
 
+  if (grip)
+    {
+      nvc_t keymeta;
+      const char *s;
+      size_t snlen;
+      nve_t item;
+      char **tokenfields = NULL;
+
+      rc = agent_keymeta_from_file (ctrl, grip, &keymeta);
+      if (!rc)
+        {
+          snlen = strlen (want_sn);
+          s = NULL;
+          for (item = nvc_lookup (keymeta, "Token:");
+               item;
+               item = nve_next_value (item, "Token:"))
+            if ((s = nve_value (item)) && !strncmp (s, want_sn, snlen))
+              break;
+          if (s && (tokenfields = strtokenize (s, " \t\n")))
+            {
+              if (tokenfields[0] && tokenfields[1] && tokenfields[2]
+                  && tokenfields[3] && strlen (tokenfields[3]) > 1)
+                {
+                  xfree (want_sn_disp);
+                  want_sn_disp = percent_plus_unescape (tokenfields[3], 0xff);
+                  if (!want_sn_disp)
+                    {
+                      rc = gpg_error_from_syserror ();
+                      xfree (tokenfields);
+                      nvc_release (keymeta);
+                      xfree (want_sn);
+                      xfree (want_kid);
+                      xfree (comment);
+                      return rc;
+                    }
+                  got_sn_disp_from_meta = 1;
+                }
+
+              xfree (tokenfields);
+            }
+
+          if ((s = nvc_get_string (keymeta, "Label:")))
+            comment = linefeed_to_percent0A (s);
+
+          nvc_release (keymeta);
+        }
+    }
+
   len = strlen (want_sn_disp);
-  if (len == 32 && !strncmp (want_sn_disp, "D27600012401", 12))
+  if (got_sn_disp_from_meta)
+    ; /* We got the the display S/N from the key file.  */
+  else if (len == 32 && !strncmp (want_sn_disp, "D27600012401", 12))
     {
       /* This is an OpenPGP card - reformat  */
       memmove (want_sn_disp, want_sn_disp+16, 4);
@@ -87,6 +173,7 @@ ask_for_card (ctrl_t ctrl, const unsigned char *shadow_info, char **r_kid)
             {
               xfree (want_sn_disp);
               xfree (want_sn);
+              xfree (comment);
               *r_kid = want_kid;
               return 0; /* yes, we have the correct card */
             }
@@ -112,12 +199,13 @@ ask_for_card (ctrl_t ctrl, const unsigned char *shadow_info, char **r_kid)
         {
           if (asprintf (&desc,
                     "%s:%%0A%%0A"
+                    "  %s%%0A"
                     "  %s",
                         no_card
                         ? L_("Please insert the card with serial number")
                         : L_("Please remove the current card and "
                              "insert the one with serial number"),
-                        want_sn_disp) < 0)
+                        want_sn_disp, comment? comment:"") < 0)
             {
               rc = out_of_core ();
             }
@@ -136,6 +224,7 @@ ask_for_card (ctrl_t ctrl, const unsigned char *shadow_info, char **r_kid)
           xfree (want_sn_disp);
           xfree (want_sn);
           xfree (want_kid);
+          xfree (comment);
           return rc;
         }
     }
@@ -447,7 +536,7 @@ divert_pksign (ctrl_t ctrl, const char *desc_text,
 
   (void)desc_text;
 
-  rc = ask_for_card (ctrl, shadow_info, &kid);
+  rc = ask_for_card (ctrl, shadow_info, grip, &kid);
   if (rc)
     return rc;
 
@@ -599,7 +688,7 @@ divert_pkdecrypt (ctrl_t ctrl, const char *desc_text,
   ciphertext = s;
   ciphertextlen = n;
 
-  rc = ask_for_card (ctrl, shadow_info, &kid);
+  rc = ask_for_card (ctrl, shadow_info, grip, &kid);
   if (rc)
     return rc;
 
diff --git a/agent/findkey.c b/agent/findkey.c
index cea2195..dadcc3c 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -52,34 +52,64 @@ struct try_unprotect_arg_s
 };
 
 
-/* Note: Ownership of FNAME and FP are moved to this function.  */
+/* Return the file name for the 20 byte keygrip GRIP.  Return NULL on
+ * error. */
+static char *
+fname_from_keygrip (const unsigned char *grip)
+{
+  char hexgrip[40+4+1];
+
+  bin2hex (grip, 20, hexgrip);
+  strcpy (hexgrip+40, ".key");
+
+  return make_filename_try (gnupg_homedir (), GNUPG_PRIVATE_KEYS_DIR,
+                            hexgrip, NULL);
+}
+
+
+/* Note: Ownership of FNAME and FP are moved to this function.
+ * OLD_FORMAT is true if the file exists but is still in the
+ * non-extended mode format.  If MAYBE_UPDATE is set the function
+ * assumes that the file exists but writes it only if it figures that
+ * an update is required.  */
 static gpg_error_t
-write_extended_private_key (char *fname, estream_t fp, int update, int newkey,
-                            const void *buf, size_t len, time_t timestamp)
+write_extended_private_key (int maybe_update,
+                            char *fname, estream_t fp,
+                            int old_format, int newkey,
+                            const void *buf, size_t len, time_t timestamp,
+                            const char *serialno, const char *keyref,
+                            const char *dispserialno)
 {
   gpg_error_t err;
   nvc_t pk = NULL;
   gcry_sexp_t key = NULL;
   int remove = 0;
+  char *token0 = NULL;
+  char *token = NULL;
+  char *dispserialno_buffer = NULL;
+  char **tokenfields = NULL;
 
-  if (update)
+  if (old_format || newkey)
     {
-      int line;
-
-      err = nvc_parse_private_key (&pk, &line, fp);
-      if (err && gpg_err_code (err) != GPG_ERR_ENOENT)
+      /* We must create a new NVC if the key is still in the old
+       * format and of course if it is a new key.  */
+      pk = nvc_new_private_key ();
+      if (!pk)
         {
-          log_error ("error parsing '%s' line %d: %s\n",
-                     fname, line, gpg_strerror (err));
+          err = gpg_error_from_syserror ();
           goto leave;
         }
+      maybe_update = 0; /* Always write.  */
     }
   else
-    {
-      pk = nvc_new_private_key ();
-      if (!pk)
+    { /* Parse the existing NVC.  */
+      int lineno = 0;
+
+      err = nvc_parse_private_key (&pk, &lineno, fp);
+      if (err)
         {
-          err = gpg_error_from_syserror ();
+          log_error ("error parsing '%s' line %d: %s\n",
+                     fname, lineno, gpg_strerror (err));
           goto leave;
         }
     }
@@ -94,8 +124,9 @@ write_extended_private_key (char *fname, estream_t fp, int update, int newkey,
     goto leave;
 
   /* If a timestamp has been supplied and the key is new write a
-   * creation timestamp.  (We double check that there is no Created
-   * item yet.)*/
+   * creation timestamp.  Note that we can't add this item if we are
+   * still in the old format.  We also add an extra check that there
+   * is no Created item yet.  */
   if (timestamp && newkey && !nvc_lookup (pk, "Created:"))
     {
       gnupg_isotime_t timebuf;
@@ -106,24 +137,92 @@ write_extended_private_key (char *fname, estream_t fp, int update, int newkey,
         goto leave;
     }
 
+  /* If requested write a Token line.  */
+  if (serialno && keyref)
+    {
+      nve_t item;
+      const char *s;
+      size_t token0len;
+
+      if (dispserialno)
+        {
+          /* Escape the DISPSERIALNO.  */
+          dispserialno_buffer = percent_plus_escape (dispserialno);
+          if (!dispserialno_buffer)
+            {
+              err = gpg_error_from_syserror ();
+              goto leave;
+            }
+          dispserialno = dispserialno_buffer;
+        }
+
+      token0 = strconcat (serialno, " ", keyref, NULL);
+      if (token0)
+        token = strconcat (token0, " - ", dispserialno? dispserialno:"-", NULL);
+      if (!token0 || !token)
+        {
+          err = gpg_error_from_syserror ();
+          goto leave;
+        }
+
+      token0len = strlen (token0);
+      for (item = nvc_lookup (pk, "Token:");
+           item;
+           item = nve_next_value (item, "Token:"))
+        if ((s = nve_value (item)) && !strncmp (s, token0, token0len))
+          break;
+      if (!item)
+        {
+          /* No token or no token with that value exists.  Add a new
+           * one so that keys which have been stored on several cards
+           * are well supported.  */
+          err = nvc_add (pk, "Token:", token);
+          if (err)
+            goto leave;
+          maybe_update = 0; /* Force write.  */
+        }
+      else
+        {
+          /* Token exists: Update the display s/n.  It may have
+           * changed due to changes in a newer software version.  */
+          if (maybe_update && s && (tokenfields = strtokenize (s, " \t\n"))
+              && tokenfields[0] && tokenfields[1] && tokenfields[2]
+              && tokenfields[3]
+              && !strcmp (tokenfields[3], dispserialno))
+            ; /* No need to update Token entry.  */
+          else
+            {
+              err = nve_set (item, token);
+              if (err)
+                goto leave;
+              maybe_update = 0; /* Force write.  */
+            }
+        }
+    }
+
   err = es_fseek (fp, 0, SEEK_SET);
   if (err)
     goto leave;
 
-  err = nvc_write (pk, fp);
-  if (err)
+  if (!maybe_update)
     {
-      log_error ("error writing '%s': %s\n", fname, gpg_strerror (err));
-      remove = 1;
-      goto leave;
-    }
+      err = nvc_write (pk, fp);
+      if (!err)
+        err = es_fflush (fp);
+      if (err)
+        {
+          log_error ("error writing '%s': %s\n", fname, gpg_strerror (err));
+          remove = 1;
+          goto leave;
+        }
 
-  if (ftruncate (es_fileno (fp), es_ftello (fp)))
-    {
-      err = gpg_error_from_syserror ();
-      log_error ("error truncating '%s': %s\n", fname, gpg_strerror (err));
-      remove = 1;
-      goto leave;
+      if (ftruncate (es_fileno (fp), es_ftello (fp)))
+        {
+          err = gpg_error_from_syserror ();
+          log_error ("error truncating '%s': %s\n", fname, gpg_strerror (err));
+          remove = 1;
+          goto leave;
+        }
     }
 
   if (es_fclose (fp))
@@ -136,13 +235,18 @@ write_extended_private_key (char *fname, estream_t fp, int update, int newkey,
   else
     fp = NULL;
 
-  bump_key_eventcounter ();
+  if (!maybe_update)
+    bump_key_eventcounter ();
 
  leave:
   es_fclose (fp);
   if (remove)
     gnupg_remove (fname);
   xfree (fname);
+  xfree (token);
+  xfree (token0);
+  xfree (dispserialno_buffer);
+  xfree (tokenfields);
   gcry_sexp_release (key);
   nvc_release (pk);
   return err;
@@ -151,21 +255,21 @@ write_extended_private_key (char *fname, estream_t fp, int update, int newkey,
 /* Write an S-expression formatted key to our key storage.  With FORCE
  * passed as true an existing key with the given GRIP will get
  * overwritten.  If TIMESTAMP is not zero and the key does not yet
- * exists it will be recorded as creation date.  */
+ * exists it will be recorded as creation date.  If SERIALNO, KEYREF,
+ * of DISPSERIALNO are not NULL they will be recorded as well.  */
 int
 agent_write_private_key (const unsigned char *grip,
                          const void *buffer, size_t length,
-                         int force, time_t timestamp)
+                         int force, time_t timestamp,
+                         const char *serialno, const char *keyref,
+                         const char *dispserialno)
 {
   char *fname;
   estream_t fp;
-  char hexgrip[40+4+1];
-
-  bin2hex (grip, 20, hexgrip);
-  strcpy (hexgrip+40, ".key");
 
-  fname = make_filename (gnupg_homedir (), GNUPG_PRIVATE_KEYS_DIR,
-                         hexgrip, NULL);
+  fname = fname_from_keygrip (grip);
+  if (!fname)
+    return gpg_error_from_syserror ();
 
   /* FIXME: Write to a temp file first so that write failures during
      key updates won't lead to a key loss.  */
@@ -223,20 +327,26 @@ agent_write_private_key (const unsigned char *grip,
       if (first != '(')
         {
           /* Key is already in the extended format.  */
-          return write_extended_private_key (fname, fp, 1, 0, buffer, length,
-                                             timestamp);
+          return write_extended_private_key (0, fname, fp, 0, 0,
+                                             buffer, length,
+                                             timestamp, serialno, keyref,
+                                             dispserialno);
         }
       if (first == '(' && opt.enable_extended_key_format)
         {
           /* Key is in the old format - but we want the extended format.  */
-          return write_extended_private_key (fname, fp, 0, 0, buffer, length,
-                                             timestamp);
+          return write_extended_private_key (0, fname, fp, 1, 0,
+                                             buffer, length,
+                                             timestamp, serialno, keyref,
+                                             dispserialno);
         }
     }
 
   if (opt.enable_extended_key_format)
-    return write_extended_private_key (fname, fp, 0, 1, buffer, length,
-                                       timestamp);
+    return write_extended_private_key (0, fname, fp, 0, 1,
+                                       buffer, length,
+                                       timestamp, serialno, keyref,
+                                       dispserialno);
 
   if (es_fwrite (buffer, length, 1, fp) != 1)
     {
@@ -713,10 +823,12 @@ unprotect (ctrl_t ctrl, const char *cache_nonce, const char *desc_text,
 
 
 /* Read the key identified by GRIP from the private key directory and
-   return it as an gcrypt S-expression object in RESULT.  On failure
-   returns an error code and stores NULL at RESULT. */
+ * return it as an gcrypt S-expression object in RESULT.  If R_KEYMETA
+ * is not NULl and the extended key format is used, the meta data
+ * items are stored there.  However the "Key:" item is removed from
+ * it.  On failure returns an error code and stores NULL at RESULT. */
 static gpg_error_t
-read_key_file (const unsigned char *grip, gcry_sexp_t *result)
+read_key_file (const unsigned char *grip, gcry_sexp_t *result, nvc_t *r_keymeta)
 {
   gpg_error_t err;
   char *fname;
@@ -729,6 +841,8 @@ read_key_file (const unsigned char *grip, gcry_sexp_t *result)
   char first;
 
   *result = NULL;
+  if (r_keymeta)
+    *r_keymeta = NULL;
 
   bin2hex (grip, 20, hexgrip);
   strcpy (hexgrip+40, ".key");
@@ -779,12 +893,17 @@ read_key_file (const unsigned char *grip, gcry_sexp_t *result)
       else
         {
           err = nvc_get_private_key (pk, result);
-          nvc_release (pk);
           if (err)
             log_error ("error getting private key from '%s': %s\n",
                        fname, gpg_strerror (err));
+          else
+            nvc_delete_named (pk, "Key:");
         }
 
+      if (!err && r_keymeta)
+        *r_keymeta = pk;
+      else
+        nvc_release (pk);
       xfree (fname);
       return err;
     }
@@ -891,7 +1010,7 @@ agent_key_from_file (ctrl_t ctrl, const char *cache_nonce,
   if (r_passphrase)
     *r_passphrase = NULL;
 
-  err = read_key_file (grip, &s_skey);
+  err = read_key_file (grip, &s_skey, NULL);
   if (err)
     {
       if (gpg_err_code (err) == GPG_ERR_ENOENT)
@@ -1221,13 +1340,28 @@ agent_raw_key_from_file (ctrl_t ctrl, const unsigned char *grip,
 
   *result = NULL;
 
-  err = read_key_file (grip, &s_skey);
+  err = read_key_file (grip, &s_skey, NULL);
   if (!err)
     *result = s_skey;
   return err;
 }
 
 
+gpg_error_t
+agent_keymeta_from_file (ctrl_t ctrl, const unsigned char *grip,
+                         nvc_t *r_keymeta)
+{
+  gpg_error_t err;
+  gcry_sexp_t s_skey;
+
+  (void)ctrl;
+
+  err = read_key_file (grip, &s_skey, r_keymeta);
+  gcry_sexp_release (s_skey);
+  return err;
+}
+
+
 /* Return the public key for the keygrip GRIP.  The result is stored
    at RESULT.  This function extracts the public key from the private
    key database.  On failure an error code is returned and NULL stored
@@ -1260,7 +1394,7 @@ agent_public_key_from_file (ctrl_t ctrl,
 
   *result = NULL;
 
-  err = read_key_file (grip, &s_skey);
+  err = read_key_file (grip, &s_skey, NULL);
   if (err)
     return err;
 
@@ -1407,7 +1541,7 @@ agent_key_info_from_file (ctrl_t ctrl, const unsigned char *grip,
   {
     gcry_sexp_t sexp;
 
-    err = read_key_file (grip, &sexp);
+    err = read_key_file (grip, &sexp, NULL);
     if (err)
       {
         if (gpg_err_code (err) == GPG_ERR_ENOENT)
@@ -1491,7 +1625,7 @@ agent_delete_key (ctrl_t ctrl, const char *desc_text,
   char *default_desc = NULL;
   int key_type;
 
-  err = read_key_file (grip, &s_skey);
+  err = read_key_file (grip, &s_skey, NULL);
   if (gpg_err_code (err) == GPG_ERR_ENOENT)
     err = gpg_error (GPG_ERR_NO_SECKEY);
   if (err)
@@ -1590,16 +1724,34 @@ agent_delete_key (ctrl_t ctrl, const char *desc_text,
 /* Write an S-expression formatted shadow key to our key storage.
    Shadow key is created by an S-expression public key in PKBUF and
    card's SERIALNO and the IDSTRING.  With FORCE passed as true an
-   existing key with the given GRIP will get overwritten.  */
+   existing key with the given GRIP will get overwritten. If
+   DISPSERIALNO is not NULL the human readable s/n will also be
+   recorded in the key file.  If MAYBE_UPDATE is set it is assumed that
+   the shadow key already exists and we test whether we should update
+   it (FORCE is ignored in this case).  */
 gpg_error_t
-agent_write_shadow_key (const unsigned char *grip,
+agent_write_shadow_key (int maybe_update, const unsigned char *grip,
                         const char *serialno, const char *keyid,
-                        const unsigned char *pkbuf, int force)
+                        const unsigned char *pkbuf, int force,
+                        const char *dispserialno)
 {
   gpg_error_t err;
   unsigned char *shadow_info;
   unsigned char *shdkey;
   size_t len;
+  char *fname = NULL;
+  estream_t fp = NULL;
+  char first;
+
+  if (maybe_update && !opt.enable_extended_key_format)
+    return 0;  /* Silently ignore.  */
+
+  /* Just in case some caller did not parse the stuff correctly, skip
+   * leading spaces.  */
+  while (spacep (serialno))
+    serialno++;
+  while (spacep (keyid))
+    keyid++;
 
   shadow_info = make_shadow_info (serialno, keyid);
   if (!shadow_info)
@@ -1614,10 +1766,62 @@ agent_write_shadow_key (const unsigned char *grip,
     }
 
   len = gcry_sexp_canon_len (shdkey, 0, NULL, NULL);
-  err = agent_write_private_key (grip, shdkey, len, force, 0);
+
+  if (maybe_update)  /* Update mode.  */
+    {
+      fname = fname_from_keygrip (grip);
+      if (!fname)
+        {
+          err = gpg_error_from_syserror ();
+          goto leave;
+        }
+
+      fp = es_fopen (fname, "rb+,mode=-rw");
+      if (!fp)
+        {
+          err = gpg_error_from_syserror ();
+          log_error ("shadow key file '%s' disappeared\n", fname);
+          goto leave;
+        }
+
+      /* See if an existing key is in extended format.  */
+      if (es_fread (&first, 1, 1, fp) != 1)
+        {
+          err = gpg_error_from_syserror ();
+          log_error ("error reading first byte from '%s': %s\n",
+                     fname, gpg_strerror (err));
+          goto leave;
+        }
+
+      if (es_fseek (fp, 0, SEEK_SET))
+        {
+          err = gpg_error_from_syserror ();
+          log_error ("error seeking in '%s': %s\n", fname, gpg_strerror (err));
+          goto leave;
+        }
+
+      /* "(first == '(')" indicates that the key is in the old format.  */
+      err = write_extended_private_key (maybe_update,
+                                        fname, fp, (first == '('), 0,
+                                        shdkey, len,
+                                        0, serialno, keyid,
+                                        dispserialno);
+      fname = NULL;  /* Ownership was transferred.  */
+      fp = NULL;     /* Ditto.  */
+    }
+  else  /* Standard mode */
+    {
+      err = agent_write_private_key (grip, shdkey, len, force, 0,
+                                     serialno, keyid, dispserialno);
+    }
+
+ leave:
+  xfree (fname);
+  es_fclose (fp);
   xfree (shdkey);
   if (err)
-    log_error ("error writing key: %s\n", gpg_strerror (err));
+    log_error ("error %s key: %s\n", maybe_update? "updating":"writing",
+               gpg_strerror (err));
 
   return err;
 }
diff --git a/agent/genkey.c b/agent/genkey.c
index 877717c..a944ac7 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -69,7 +69,8 @@ store_key (gcry_sexp_t private, const char *passphrase, int force,
       buf = p;
     }
 
-  rc = agent_write_private_key (grip, buf, len, force, timestamp);
+  rc = agent_write_private_key (grip, buf, len, force, timestamp,
+                                NULL, NULL, NULL);
   xfree (buf);
   return rc;
 }
@@ -99,7 +100,7 @@ do_check_passphrase_pattern (ctrl_t ctrl, const char *pw, unsigned int flags)
 {
   gpg_error_t err = 0;
   const char *pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CHECK_PATTERN);
-  FILE *infp;
+  estream_t stream_to_check_pattern = NULL;
   const char *argv[10];
   pid_t pid;
   int result, i;
@@ -137,27 +138,6 @@ do_check_passphrase_pattern (ctrl_t ctrl, const char *pw, unsigned int flags)
       return 1; /* Do not pass the check.  */
     }
 
-  infp = gnupg_tmpfile ();
-  if (!infp)
-    {
-      err = gpg_error_from_syserror ();
-      log_error (_("error creating temporary file: %s\n"), gpg_strerror (err));
-      xfree (patternfname);
-      return 1; /* Error - assume password should not be used.  */
-    }
-
-  if (fwrite (pw, strlen (pw), 1, infp) != 1)
-    {
-      err = gpg_error_from_syserror ();
-      log_error (_("error writing to temporary file: %s\n"),
-                 gpg_strerror (err));
-      fclose (infp);
-      xfree (patternfname);
-      return 1; /* Error - assume password should not be used.  */
-    }
-  fseek (infp, 0, SEEK_SET);
-  clearerr (infp);
-
   i = 0;
   argv[i++] = "--null";
   argv[i++] = "--",
@@ -165,21 +145,27 @@ do_check_passphrase_pattern (ctrl_t ctrl, const char *pw, unsigned int flags)
   argv[i] = NULL;
   assert (i < sizeof argv);
 
-  if (gnupg_spawn_process_fd (pgmname, argv, fileno (infp), -1, -1, &pid))
+  if (gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
+                           &stream_to_check_pattern, NULL, NULL, &pid))
     result = 1; /* Execute error - assume password should no be used.  */
-  else if (gnupg_wait_process (pgmname, pid, 1, NULL))
-    result = 1; /* Helper returned an error - probably a match.  */
   else
-    result = 0; /* Success; i.e. no match.  */
-  gnupg_release_process (pid);
-
-  /* Overwrite our temporary file. */
-  fseek (infp, 0, SEEK_SET);
-  clearerr (infp);
-  for (i=((strlen (pw)+99)/100)*100; i > 0; i--)
-    putc ('\xff', infp);
-  fflush (infp);
-  fclose (infp);
+    {
+      es_set_binary (stream_to_check_pattern);
+      if (es_fwrite (pw, strlen (pw), 1, stream_to_check_pattern) != 1)
+        {
+          err = gpg_error_from_syserror ();
+          log_error (_("error writing to pipe: %s\n"), gpg_strerror (err));
+          result = 1; /* Error - assume password should not be used.  */
+        }
+      else
+        es_fflush (stream_to_check_pattern);
+      es_fclose (stream_to_check_pattern);
+      if (gnupg_wait_process (pgmname, pid, 1, NULL))
+        result = 1; /* Helper returned an error - probably a match.  */
+      else
+        result = 0; /* Success; i.e. no match.  */
+      gnupg_release_process (pid);
+    }
 
   xfree (patternfname);
   return result;
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index b126174..53b86dd 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -82,7 +82,6 @@ enum cmd_and_opt_values
   oDebugWait,
   oDebugQuickRandom,
   oDebugPinentry,
-  oNoGreeting,
   oNoOptions,
   oHomedir,
   oNoDetach,
@@ -129,6 +128,8 @@ enum cmd_and_opt_values
   oIgnoreCacheForSigning,
   oAllowMarkTrusted,
   oNoAllowMarkTrusted,
+  oNoUserTrustlist,
+  oSysTrustlistName,
   oAllowPresetPassphrase,
   oAllowLoopbackPinentry,
   oNoAllowLoopbackPinentry,
@@ -156,105 +157,66 @@ enum cmd_and_opt_values
 # define ENAMETOOLONG EINVAL
 #endif
 
-
 static ARGPARSE_OPTS opts[] = {
 
   ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
   ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
   ARGPARSE_c (aUseStandardSocketP, "use-standard-socket-p", "@"),
 
-  ARGPARSE_group (301, N_("@Options:\n ")),
+
+  ARGPARSE_header (NULL, N_("Options used for startup")),
 
   ARGPARSE_s_n (oDaemon,  "daemon", N_("run in daemon mode (background)")),
   ARGPARSE_s_n (oServer,  "server", N_("run in server mode (foreground)")),
 #ifndef HAVE_W32_SYSTEM
   ARGPARSE_s_n (oSupervised,  "supervised", N_("run in supervised mode")),
 #endif
-  ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
-  ARGPARSE_s_n (oQuiet,	  "quiet",     N_("be somewhat more quiet")),
+  ARGPARSE_s_n (oNoDetach,  "no-detach", N_("do not detach from the console")),
   ARGPARSE_s_n (oSh,	  "sh",        N_("sh-style command output")),
   ARGPARSE_s_n (oCsh,	  "csh",       N_("csh-style command output")),
   ARGPARSE_s_n (oStealSocket, "steal-socket", "@"),
+  ARGPARSE_s_s (oDisplay,    "display",     "@"),
+  ARGPARSE_s_s (oTTYname,    "ttyname",     "@"),
+  ARGPARSE_s_s (oTTYtype,    "ttytype",     "@"),
+  ARGPARSE_s_s (oLCctype,    "lc-ctype",    "@"),
+  ARGPARSE_s_s (oLCmessages, "lc-messages", "@"),
+  ARGPARSE_s_s (oXauthority, "xauthority",  "@"),
+  ARGPARSE_s_s (oHomedir,    "homedir",      "@"),
   ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
+  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
 
+
+  ARGPARSE_header ("Monitor", N_("Options controlling the diagnostic output")),
+
+  ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
+  ARGPARSE_s_n (oQuiet,	  "quiet",     N_("be somewhat more quiet")),
   ARGPARSE_s_s (oDebug,	     "debug",       "@"),
   ARGPARSE_s_n (oDebugAll,   "debug-all",   "@"),
   ARGPARSE_s_s (oDebugLevel, "debug-level", "@"),
   ARGPARSE_s_i (oDebugWait,  "debug-wait",  "@"),
   ARGPARSE_s_n (oDebugQuickRandom, "debug-quick-random", "@"),
   ARGPARSE_s_n (oDebugPinentry, "debug-pinentry", "@"),
+  ARGPARSE_s_s (oLogFile,   "log-file",
+                /* */       N_("|FILE|write server mode logs to FILE")),
+
+
+  ARGPARSE_header ("Configuration",
+                   N_("Options controlling the configuration")),
 
-  ARGPARSE_s_n (oNoDetach,  "no-detach", N_("do not detach from the console")),
-  ARGPARSE_s_n (oGrab,      "grab",      "@"),
-                /* FIXME: Add the below string for 2.3 */
-                /* N_("let PIN-Entry grab keyboard and mouse")), */
-  ARGPARSE_s_n (oNoGrab,    "no-grab",   "@"),
-  ARGPARSE_s_s (oLogFile,   "log-file",  N_("use a log file for the server")),
-  ARGPARSE_s_s (oPinentryProgram, "pinentry-program",
-                /* */             N_("|PGM|use PGM as the PIN-Entry program")),
-  ARGPARSE_s_s (oPinentryTouchFile, "pinentry-touch-file", "@"),
-  ARGPARSE_s_s (oPinentryInvisibleChar, "pinentry-invisible-char", "@"),
-  ARGPARSE_s_u (oPinentryTimeout, "pinentry-timeout", "@"),
-  ARGPARSE_s_n (oPinentryFormattedPassphrase, "pinentry-formatted-passphrase",
-                "@"),
-  ARGPARSE_s_s (oScdaemonProgram, "scdaemon-program",
-                /* */             N_("|PGM|use PGM as the SCdaemon program") ),
   ARGPARSE_s_n (oDisableScdaemon, "disable-scdaemon",
                 /* */             N_("do not use the SCdaemon") ),
+  ARGPARSE_s_s (oScdaemonProgram, "scdaemon-program",
+                /* */             N_("|PGM|use PGM as the SCdaemon program") ),
   ARGPARSE_s_n (oDisableCheckOwnSocket, "disable-check-own-socket", "@"),
 
   ARGPARSE_s_s (oExtraSocket, "extra-socket",
                 /* */       N_("|NAME|accept some commands via NAME")),
 
   ARGPARSE_s_s (oBrowserSocket, "browser-socket", "@"),
-
-  ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
-
-  ARGPARSE_s_n (oBatch,      "batch",        "@"),
-  ARGPARSE_s_s (oHomedir,    "homedir",      "@"),
-
-  ARGPARSE_s_s (oDisplay,    "display",     "@"),
-  ARGPARSE_s_s (oTTYname,    "ttyname",     "@"),
-  ARGPARSE_s_s (oTTYtype,    "ttytype",     "@"),
-  ARGPARSE_s_s (oLCctype,    "lc-ctype",    "@"),
-  ARGPARSE_s_s (oLCmessages, "lc-messages", "@"),
-  ARGPARSE_s_s (oXauthority, "xauthority",  "@"),
   ARGPARSE_s_n (oKeepTTY,    "keep-tty",
                 /* */        N_("ignore requests to change the TTY")),
   ARGPARSE_s_n (oKeepDISPLAY, "keep-display",
                 /* */        N_("ignore requests to change the X display")),
-
-  ARGPARSE_s_u (oDefCacheTTL,    "default-cache-ttl",
-                                 N_("|N|expire cached PINs after N seconds")),
-  ARGPARSE_s_u (oDefCacheTTLSSH, "default-cache-ttl-ssh", "@" ),
-  ARGPARSE_s_u (oMaxCacheTTL,    "max-cache-ttl",         "@" ),
-  ARGPARSE_s_u (oMaxCacheTTLSSH, "max-cache-ttl-ssh",     "@" ),
-
-  ARGPARSE_s_n (oEnforcePassphraseConstraints, "enforce-passphrase-constraints",
-                /* */                          "@"),
-  ARGPARSE_s_u (oMinPassphraseLen,        "min-passphrase-len", "@"),
-  ARGPARSE_s_u (oMinPassphraseNonalpha,   "min-passphrase-nonalpha", "@"),
-  ARGPARSE_s_s (oCheckPassphrasePattern,  "check-passphrase-pattern", "@"),
-  ARGPARSE_s_s (oCheckSymPassphrasePattern,  "check-sym-passphrase-pattern",
-                "@"),
-  ARGPARSE_s_u (oMaxPassphraseDays,       "max-passphrase-days", "@"),
-  ARGPARSE_s_n (oEnablePassphraseHistory, "enable-passphrase-history", "@"),
-
-  ARGPARSE_s_n (oIgnoreCacheForSigning, "ignore-cache-for-signing",
-                /* */    N_("do not use the PIN cache when signing")),
-  ARGPARSE_s_n (oNoAllowExternalCache,  "no-allow-external-cache",
-                /* */    N_("disallow the use of an external password cache")),
-  ARGPARSE_s_n (oNoAllowMarkTrusted, "no-allow-mark-trusted",
-                /* */    N_("disallow clients to mark keys as \"trusted\"")),
-  ARGPARSE_s_n (oAllowMarkTrusted,   "allow-mark-trusted", "@"),
-  ARGPARSE_s_n (oAllowPresetPassphrase, "allow-preset-passphrase",
-                /* */                    N_("allow presetting passphrase")),
-  ARGPARSE_s_n (oNoAllowLoopbackPinentry, "no-allow-loopback-pinentry",
-                                N_("disallow caller to override the pinentry")),
-  ARGPARSE_s_n (oAllowLoopbackPinentry, "allow-loopback-pinentry", "@"),
-  ARGPARSE_s_n (oAllowEmacsPinentry,  "allow-emacs-pinentry",
-                /* */    N_("allow passphrase to be prompted through Emacs")),
-
   ARGPARSE_s_n (oSSHSupport,   "enable-ssh-support", N_("enable ssh support")),
   ARGPARSE_s_s (oSSHFingerprintDigest, "ssh-fingerprint-digest",
                 N_("|ALGO|use ALGO to show ssh fingerprints")),
@@ -267,14 +229,73 @@ static ARGPARSE_OPTS opts[] = {
                 ),
   ARGPARSE_s_n (oDisableExtendedKeyFormat, "disable-extended-key-format", "@"),
   ARGPARSE_s_n (oEnableExtendedKeyFormat, "enable-extended-key-format", "@"),
+  ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
+  ARGPARSE_op_u (oAutoExpandSecmem, "auto-expand-secmem", "@"),
+  ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
+
 
+  ARGPARSE_header ("Security", N_("Options controlling the security")),
+
+  ARGPARSE_s_u (oDefCacheTTL,    "default-cache-ttl",
+                                 N_("|N|expire cached PINs after N seconds")),
+  ARGPARSE_s_u (oDefCacheTTLSSH, "default-cache-ttl-ssh",
+                /* */            N_("|N|expire SSH keys after N seconds")),
+  ARGPARSE_s_u (oMaxCacheTTL,    "max-cache-ttl",
+                /* */     N_("|N|set maximum PIN cache lifetime to N seconds")),
+  ARGPARSE_s_u (oMaxCacheTTLSSH, "max-cache-ttl-ssh",
+                /* */     N_("|N|set maximum SSH key lifetime to N seconds")),
+  ARGPARSE_s_n (oIgnoreCacheForSigning, "ignore-cache-for-signing",
+                /* */    N_("do not use the PIN cache when signing")),
+  ARGPARSE_s_n (oNoAllowExternalCache,  "no-allow-external-cache",
+                /* */    N_("disallow the use of an external password cache")),
+  ARGPARSE_s_n (oNoAllowMarkTrusted, "no-allow-mark-trusted",
+                /* */    N_("disallow clients to mark keys as \"trusted\"")),
+  ARGPARSE_s_n (oAllowMarkTrusted,   "allow-mark-trusted", "@"),
+  ARGPARSE_s_n (oNoUserTrustlist,    "no-user-trustlist", "@"),
+  ARGPARSE_s_s (oSysTrustlistName,   "sys-trustlist-name", "@"),
+  ARGPARSE_s_n (oAllowPresetPassphrase, "allow-preset-passphrase",
+                /* */                    N_("allow presetting passphrase")),
   ARGPARSE_s_u (oS2KCount, "s2k-count", "@"),
   ARGPARSE_s_u (oS2KCalibration, "s2k-calibration", "@"),
 
-  ARGPARSE_op_u (oAutoExpandSecmem, "auto-expand-secmem", "@"),
+  ARGPARSE_header ("Passphrase policy",
+                   N_("Options enforcing a passphrase policy")),
+
+  ARGPARSE_s_n (oEnforcePassphraseConstraints, "enforce-passphrase-constraints",
+                N_("do not allow bypassing the passphrase policy")),
+  ARGPARSE_s_u (oMinPassphraseLen,        "min-passphrase-len",
+                N_("|N|set minimal required length for new passphrases to N")),
+  ARGPARSE_s_u (oMinPassphraseNonalpha,   "min-passphrase-nonalpha",
+                N_("|N|require at least N non-alpha"
+                   " 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",
+                N_("do not allow the reuse of old passphrases")),
 
-  ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
-  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
+
+  ARGPARSE_header ("Pinentry", N_("Options controlling the PIN-Entry")),
+
+  ARGPARSE_s_n (oBatch,  "batch",  N_("never use the PIN-entry")),
+  ARGPARSE_s_n (oNoAllowLoopbackPinentry, "no-allow-loopback-pinentry",
+                N_("disallow caller to override the pinentry")),
+  ARGPARSE_s_n (oAllowLoopbackPinentry, "allow-loopback-pinentry", "@"),
+  ARGPARSE_s_n (oGrab,   "grab",   N_("let PIN-Entry grab keyboard and mouse")),
+  ARGPARSE_s_n (oNoGrab, "no-grab",   "@"),
+  ARGPARSE_s_s (oPinentryProgram, "pinentry-program",
+                /* */             N_("|PGM|use PGM as the PIN-Entry program")),
+  ARGPARSE_s_s (oPinentryTouchFile, "pinentry-touch-file", "@"),
+  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")),
 
   /* Dummy options for backward compatibility.  */
   ARGPARSE_o_s (oWriteEnvFile, "write-env-file", "@"),
@@ -856,6 +877,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
       opt.enable_extended_key_format = 1;
       opt.ignore_cache_for_signing = 0;
       opt.allow_mark_trusted = 1;
+      opt.sys_trustlist_name = NULL;
       opt.allow_external_cache = 1;
       opt.allow_loopback_pinentry = 1;
       opt.allow_emacs_pinentry = 0;
@@ -946,6 +968,8 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
 
     case oAllowMarkTrusted: opt.allow_mark_trusted = 1; break;
     case oNoAllowMarkTrusted: opt.allow_mark_trusted = 0; break;
+    case oNoUserTrustlist: opt.no_user_trustlist = 1; break;
+    case oSysTrustlistName: opt.sys_trustlist_name = pargs->r.ret_str; break;
 
     case oAllowPresetPassphrase: opt.allow_preset_passphrase = 1; break;
 
@@ -991,6 +1015,11 @@ finalize_rereadable_options (void)
   /* Hack to allow --grab to override --no-grab.  */
   if ((opt.no_grab & 2))
     opt.no_grab = 0;
+
+  /* With --no-user-trustlist it does not make sense to allow the mark
+   * trusted feature.  */
+  if (opt.no_user_trustlist)
+    opt.allow_mark_trusted = 0;
 }
 
 
@@ -1207,7 +1236,6 @@ main (int argc, char **argv )
 
         case oDebugWait: debug_wait = pargs.r.ret_int; break;
 
-        case oNoGreeting: /* Dummy option.  */ break;
         case oNoVerbose: opt.verbose = 0; break;
         case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break;
         case oNoDetach: nodetach = 1; break;
@@ -1304,7 +1332,7 @@ main (int argc, char **argv )
           log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
     }
 
-  gpgrt_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
 
   if (!last_configname)
     config_filename = make_filename (gnupg_homedir (),
@@ -1403,71 +1431,25 @@ main (int argc, char **argv )
     agent_exit (0);
   else if (gpgconf_list)
     {
-      char *filename_esc;
-
-      /* List options and default values in the GPG Conf format.  */
-      filename_esc = percent_escape (config_filename, NULL);
-      es_printf ("%s-%s.conf:%lu:\"%s\n",
-                 GPGCONF_NAME, GPG_AGENT_NAME,
-                 GC_OPT_FLAG_DEFAULT, filename_esc);
-      xfree (filename_esc);
-
-      es_printf ("verbose:%lu:\n"
-              "quiet:%lu:\n"
-              "debug-level:%lu:\"none:\n"
-              "log-file:%lu:\n",
-              GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME,
-              GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME,
-              GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME,
-              GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME );
+      es_printf ("debug-level:%lu:\"none:\n", GC_OPT_FLAG_DEFAULT);
       es_printf ("default-cache-ttl:%lu:%d:\n",
-              GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME, DEFAULT_CACHE_TTL );
+              GC_OPT_FLAG_DEFAULT, DEFAULT_CACHE_TTL );
       es_printf ("default-cache-ttl-ssh:%lu:%d:\n",
-              GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME, DEFAULT_CACHE_TTL_SSH );
+              GC_OPT_FLAG_DEFAULT, DEFAULT_CACHE_TTL_SSH );
       es_printf ("max-cache-ttl:%lu:%d:\n",
-              GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME, MAX_CACHE_TTL );
+              GC_OPT_FLAG_DEFAULT, MAX_CACHE_TTL );
       es_printf ("max-cache-ttl-ssh:%lu:%d:\n",
-              GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME, MAX_CACHE_TTL_SSH );
+              GC_OPT_FLAG_DEFAULT, MAX_CACHE_TTL_SSH );
       es_printf ("enforce-passphrase-constraints:%lu:\n",
-              GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
+              GC_OPT_FLAG_NONE);
       es_printf ("min-passphrase-len:%lu:%d:\n",
-              GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME, MIN_PASSPHRASE_LEN );
+              GC_OPT_FLAG_DEFAULT, MIN_PASSPHRASE_LEN );
       es_printf ("min-passphrase-nonalpha:%lu:%d:\n",
-              GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME,
-              MIN_PASSPHRASE_NONALPHA);
-      es_printf ("check-passphrase-pattern:%lu:\n",
-              GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME);
-      es_printf ("check-sym-passphrase-pattern:%lu:\n",
-              GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME);
+              GC_OPT_FLAG_DEFAULT, MIN_PASSPHRASE_NONALPHA);
       es_printf ("max-passphrase-days:%lu:%d:\n",
-              GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME,
-              MAX_PASSPHRASE_DAYS);
-      es_printf ("enable-passphrase-history:%lu:\n",
-              GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
-      es_printf ("no-grab:%lu:\n",
-              GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
-      es_printf ("ignore-cache-for-signing:%lu:\n",
-              GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
-      es_printf ("no-allow-external-cache:%lu:\n",
-              GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
-      es_printf ("no-allow-mark-trusted:%lu:\n",
-              GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
-      es_printf ("disable-scdaemon:%lu:\n",
-              GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
-      es_printf ("enable-ssh-support:%lu:\n", GC_OPT_FLAG_NONE);
+              GC_OPT_FLAG_DEFAULT, MAX_PASSPHRASE_DAYS);
       es_printf ("ssh-fingerprint-digest:%lu:\"%s:\n",
-                 GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME, "md5");
-#ifdef HAVE_W32_SYSTEM
-      es_printf ("enable-putty-support:%lu:\n", GC_OPT_FLAG_NONE);
-#endif
-      es_printf ("no-allow-loopback-pinentry:%lu:\n",
-              GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
-      es_printf ("allow-emacs-pinentry:%lu:\n",
-                 GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
-      es_printf ("pinentry-timeout:%lu:0:\n",
-                 GC_OPT_FLAG_DEFAULT|GC_OPT_FLAG_RUNTIME);
-      es_printf ("grab:%lu:\n",
-                 GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME);
+                 GC_OPT_FLAG_DEFAULT, "md5");
 
       agent_exit (0);
     }
diff --git a/agent/learncard.c b/agent/learncard.c
index abe1dd0..2e491e1 100644
--- a/agent/learncard.c
+++ b/agent/learncard.c
@@ -409,7 +409,14 @@ agent_handle_learn (ctrl_t ctrl, int send, void *assuan_context, int force)
           goto leave;
         }
 
-      rc = agent_write_shadow_key (grip, serialno, item->id, pubkey, force);
+      {
+        char *dispserialno;
+
+        agent_card_getattr (ctrl, "$DISPSERIALNO", &dispserialno);
+        rc = agent_write_shadow_key (0, grip, serialno, item->id, pubkey,
+                                     force, dispserialno);
+        xfree (dispserialno);
+      }
       xfree (pubkey);
       if (rc)
         goto leave;
diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index b04836a..fb2c71d 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -810,13 +810,18 @@ agent_askpin (ctrl_t ctrl,
 int
 agent_write_private_key (const unsigned char *grip,
                          const void *buffer, size_t length, int force,
-                         time_t timestamp)
+                         time_t timestamp,
+                         const char *serialno, const char *keyref,
+                         const char *dispserialno)
 {
   char hexgrip[40+4+1];
   char *p;
 
   (void)force;
   (void)timestamp;
+  (void)serialno;
+  (void)keyref;
+  (void)dispserialno;
 
   bin2hex (grip, 20, hexgrip);
   strcpy (hexgrip+40, ".key");
diff --git a/agent/trustlist.c b/agent/trustlist.c
index 50f2ad4..086d8ae 100644
--- a/agent/trustlist.c
+++ b/agent/trustlist.c
@@ -128,8 +128,26 @@ clear_trusttable (void)
 }
 
 
+/* Return the name of the system trustlist.  Caller must free.  */
+static char *
+make_sys_trustlist_name (void)
+{
+  if (opt.sys_trustlist_name
+      && (strchr (opt.sys_trustlist_name, '/')
+          || strchr (opt.sys_trustlist_name, '\\')
+          || (*opt.sys_trustlist_name == '~'
+              && opt.sys_trustlist_name[1] == '/')))
+    return make_absfilename (opt.sys_trustlist_name, NULL);
+  else
+    return make_filename (gnupg_sysconfdir (),
+                          (opt.sys_trustlist_name ?
+                           opt.sys_trustlist_name : "trustlist.txt"),
+                          NULL);
+}
+
+
 static gpg_error_t
-read_one_trustfile (const char *fname, int allow_include,
+read_one_trustfile (const char *fname, int systrust,
                     trustitem_t **addr_of_table,
                     size_t *addr_of_tablesize,
                     int *addr_of_tableidx)
@@ -188,7 +206,7 @@ read_one_trustfile (const char *fname, int allow_include,
           gpg_error_t err2;
           gpg_err_code_t ec;
 
-          if (!allow_include)
+          if (systrust)
             {
               log_error (_("statement \"%s\" ignored in '%s', line %d\n"),
                          "include-default", fname, lnr);
@@ -196,7 +214,7 @@ read_one_trustfile (const char *fname, int allow_include,
             }
           /* fixme: Should check for trailing garbage.  */
 
-          etcname = make_filename (gnupg_sysconfdir (), "trustlist.txt", NULL);
+          etcname = make_sys_trustlist_name ();
           if ( !strcmp (etcname, fname) ) /* Same file. */
             log_info (_("statement \"%s\" ignored in '%s', line %d\n"),
                       "include-default", fname, lnr);
@@ -208,7 +226,7 @@ read_one_trustfile (const char *fname, int allow_include,
             }
           else
             {
-              err2 = read_one_trustfile (etcname, 0,
+              err2 = read_one_trustfile (etcname, 1,
                                          &table, &tablesize, &tableidx);
               if (err2)
                 err = err2;
@@ -337,7 +355,7 @@ read_trustfiles (void)
   int tableidx;
   size_t tablesize;
   char *fname;
-  int allow_include = 1;
+  int systrust = 0;
   gpg_err_code_t ec;
 
   tablesize = 20;
@@ -346,17 +364,24 @@ read_trustfiles (void)
     return gpg_error_from_syserror ();
   tableidx = 0;
 
-  fname = make_filename_try (gnupg_homedir (), "trustlist.txt", NULL);
-  if (!fname)
+  if (opt.no_user_trustlist)
+    fname = NULL;
+  else
     {
-      err = gpg_error_from_syserror ();
-      xfree (table);
-      return err;
+      fname = make_filename_try (gnupg_homedir (), "trustlist.txt", NULL);
+      if (!fname)
+        {
+          err = gpg_error_from_syserror ();
+          xfree (table);
+          return err;
+        }
     }
 
-  if ((ec = gnupg_access (fname, F_OK)))
+  if (!fname || (ec = gnupg_access (fname, F_OK)))
     {
-      if ( ec == GPG_ERR_ENOENT )
+      if (!fname)
+        ; /* --no-user-trustlist active.  */
+      else if ( ec == GPG_ERR_ENOENT )
         ; /* Silently ignore a non-existing trustfile.  */
       else
         {
@@ -364,11 +389,10 @@ read_trustfiles (void)
           log_error (_("error opening '%s': %s\n"), fname, gpg_strerror (err));
         }
       xfree (fname);
-      fname = make_filename (gnupg_sysconfdir (), "trustlist.txt", NULL);
-      allow_include = 0;
+      fname = make_sys_trustlist_name ();
+      systrust = 1;
     }
-  err = read_one_trustfile (fname, allow_include,
-                            &table, &tablesize, &tableidx);
+  err = read_one_trustfile (fname, systrust, &table, &tablesize, &tableidx);
   xfree (fname);
 
   if (err)
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index d050457..94e6631 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -243,6 +243,9 @@ $(eval $(call READ_AUTOGEN_template,AUTHENTICODE_SIGNHOST))
 $(eval $(call READ_AUTOGEN_template,AUTHENTICODE_TOOL))
 $(eval $(call READ_AUTOGEN_template,AUTHENTICODE_KEY))
 $(eval $(call READ_AUTOGEN_template,AUTHENTICODE_CERTS))
+$(eval $(call READ_AUTOGEN_template,OSSLSIGNCODE))
+$(eval $(call READ_AUTOGEN_template,OSSLPKCS11ENGINE))
+$(eval $(call READ_AUTOGEN_template,SCUTEMODULE))
 
 # All files given in AUTHENTICODE_FILES are signed before
 # they are put into the installer.
@@ -1431,6 +1434,15 @@ define AUTHENTICODE_sign
         /fd sha256 /du https://gnupg.org a.exe ;\
      scp "$(AUTHENTICODE_SIGNHOST):a.exe" $(2);\
      echo "speedo: signed file is '$(2)'" ;\
+   elif [ "$(AUTHENTICODE_KEY)" = card ]; then \
+     echo "speedo: Signing using a card";\
+     $(OSSLSIGNCODE) sign \
+       -pkcs11engine $(OSSLPKCS11ENGINE) \
+       -pkcs11module $(SCUTEMODULE) \
+       -certs $(AUTHENTICODE_CERTS) \
+       -h sha256 -n GnuPG -i https://gnupg.org \
+       -ts http://rfc3161timestamp.globalsign.com/advanced \
+       -in $(1) -out $(2).tmp ; mv $(2).tmp $(2) ; \
    elif [ -e "$(AUTHENTICODE_KEY)" ]; then \
      echo "speedo: Signing using key $(AUTHENTICODE_KEY)";\
      osslsigncode sign -certs $(AUTHENTICODE_CERTS) \
@@ -1443,6 +1455,14 @@ define AUTHENTICODE_sign
    fi
 endef
 
+# Help target for testing to sign a file.
+# Usage: make -f speedo.mk test-authenticode-sign TARGETOS=w32 FILE=foo.exe
+test-authenticode-sign:
+	(set -e; \
+	 echo "Test signining of $(FILE)" ; \
+	 $(call AUTHENTICODE_sign,"$(FILE)","$(FILE)");\
+	)
+
 
 # Build the installer from the source tarball.
 installer-from-source: dist-source
diff --git a/common/Makefile.am b/common/Makefile.am
index cca1018..bd281d6 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -61,7 +61,7 @@ common_sources = \
 	openpgpdefs.h \
 	gc-opt-flags.h \
 	sexp-parse.h \
-	tlv.c tlv.h \
+	tlv.c tlv.h tlv-builder.c \
 	init.c init.h \
 	sexputil.c \
 	sysutils.c sysutils.h \
diff --git a/common/Makefile.in b/common/Makefile.in
index 11e4c23..d78f9c0 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -205,20 +205,20 @@ am__libcommon_a_SOURCES_DIST = common-defs.h util.h utilproto.h \
 	utf8conv.c utf8conv.h argparse.c argparse.h logging.c \
 	logging.h dotlock.c dotlock.h mischelp.c mischelp.h status.c \
 	status.h shareddefs.h openpgpdefs.h gc-opt-flags.h \
-	sexp-parse.h tlv.c tlv.h 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 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 \
-	compliance.c compliance.h w32-reg.c w32-cmdline.c \
-	exechelp-w32ce.c exechelp-w32.c exechelp-posix.c \
-	get-passphrase.c get-passphrase.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 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 compliance.c compliance.h \
+	w32-reg.c w32-cmdline.c exechelp-w32ce.c exechelp-w32.c \
+	exechelp-posix.c get-passphrase.c get-passphrase.h
 @HAVE_W32_SYSTEM_TRUE@am__objects_1 = libcommon_a-w32-reg.$(OBJEXT) \
 @HAVE_W32_SYSTEM_TRUE@	libcommon_a-w32-cmdline.$(OBJEXT)
 @HAVE_W32CE_SYSTEM_TRUE@@HAVE_W32_SYSTEM_TRUE@am__objects_2 = libcommon_a-exechelp-w32ce.$(OBJEXT)
@@ -231,13 +231,13 @@ am__objects_5 = libcommon_a-i18n.$(OBJEXT) \
 	libcommon_a-utf8conv.$(OBJEXT) libcommon_a-argparse.$(OBJEXT) \
 	libcommon_a-logging.$(OBJEXT) libcommon_a-dotlock.$(OBJEXT) \
 	libcommon_a-mischelp.$(OBJEXT) libcommon_a-status.$(OBJEXT) \
-	libcommon_a-tlv.$(OBJEXT) libcommon_a-init.$(OBJEXT) \
-	libcommon_a-sexputil.$(OBJEXT) libcommon_a-sysutils.$(OBJEXT) \
-	libcommon_a-homedir.$(OBJEXT) libcommon_a-gettime.$(OBJEXT) \
-	libcommon_a-yesno.$(OBJEXT) libcommon_a-b64enc.$(OBJEXT) \
-	libcommon_a-b64dec.$(OBJEXT) libcommon_a-zb32.$(OBJEXT) \
-	libcommon_a-convert.$(OBJEXT) libcommon_a-percent.$(OBJEXT) \
-	libcommon_a-mbox-util.$(OBJEXT) \
+	libcommon_a-tlv.$(OBJEXT) libcommon_a-tlv-builder.$(OBJEXT) \
+	libcommon_a-init.$(OBJEXT) libcommon_a-sexputil.$(OBJEXT) \
+	libcommon_a-sysutils.$(OBJEXT) libcommon_a-homedir.$(OBJEXT) \
+	libcommon_a-gettime.$(OBJEXT) libcommon_a-yesno.$(OBJEXT) \
+	libcommon_a-b64enc.$(OBJEXT) libcommon_a-b64dec.$(OBJEXT) \
+	libcommon_a-zb32.$(OBJEXT) libcommon_a-convert.$(OBJEXT) \
+	libcommon_a-percent.$(OBJEXT) libcommon_a-mbox-util.$(OBJEXT) \
 	libcommon_a-miscellaneous.$(OBJEXT) \
 	libcommon_a-xasprintf.$(OBJEXT) \
 	libcommon_a-xreadline.$(OBJEXT) libcommon_a-membuf.$(OBJEXT) \
@@ -269,20 +269,20 @@ am__libcommonpth_a_SOURCES_DIST = common-defs.h util.h utilproto.h \
 	utf8conv.c utf8conv.h argparse.c argparse.h logging.c \
 	logging.h dotlock.c dotlock.h mischelp.c mischelp.h status.c \
 	status.h shareddefs.h openpgpdefs.h gc-opt-flags.h \
-	sexp-parse.h tlv.c tlv.h 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 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 \
-	compliance.c compliance.h w32-reg.c w32-cmdline.c \
-	exechelp-w32ce.c exechelp-w32.c exechelp-posix.c call-gpg.c \
-	call-gpg.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 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 compliance.c compliance.h \
+	w32-reg.c w32-cmdline.c exechelp-w32ce.c exechelp-w32.c \
+	exechelp-posix.c call-gpg.c call-gpg.h
 @HAVE_W32_SYSTEM_TRUE@am__objects_7 =  \
 @HAVE_W32_SYSTEM_TRUE@	libcommonpth_a-w32-reg.$(OBJEXT) \
 @HAVE_W32_SYSTEM_TRUE@	libcommonpth_a-w32-cmdline.$(OBJEXT)
@@ -299,6 +299,7 @@ am__objects_11 = libcommonpth_a-i18n.$(OBJEXT) \
 	libcommonpth_a-dotlock.$(OBJEXT) \
 	libcommonpth_a-mischelp.$(OBJEXT) \
 	libcommonpth_a-status.$(OBJEXT) libcommonpth_a-tlv.$(OBJEXT) \
+	libcommonpth_a-tlv-builder.$(OBJEXT) \
 	libcommonpth_a-init.$(OBJEXT) \
 	libcommonpth_a-sexputil.$(OBJEXT) \
 	libcommonpth_a-sysutils.$(OBJEXT) \
@@ -491,6 +492,7 @@ am__depfiles_remade = ./$(DEPDIR)/gpgrlhelp.Po \
 	./$(DEPDIR)/libcommon_a-stringhelp.Po \
 	./$(DEPDIR)/libcommon_a-strlist.Po \
 	./$(DEPDIR)/libcommon_a-sysutils.Po \
+	./$(DEPDIR)/libcommon_a-tlv-builder.Po \
 	./$(DEPDIR)/libcommon_a-tlv.Po \
 	./$(DEPDIR)/libcommon_a-ttyio.Po \
 	./$(DEPDIR)/libcommon_a-userids.Po \
@@ -546,6 +548,7 @@ am__depfiles_remade = ./$(DEPDIR)/gpgrlhelp.Po \
 	./$(DEPDIR)/libcommonpth_a-stringhelp.Po \
 	./$(DEPDIR)/libcommonpth_a-strlist.Po \
 	./$(DEPDIR)/libcommonpth_a-sysutils.Po \
+	./$(DEPDIR)/libcommonpth_a-tlv-builder.Po \
 	./$(DEPDIR)/libcommonpth_a-tlv.Po \
 	./$(DEPDIR)/libcommonpth_a-ttyio.Po \
 	./$(DEPDIR)/libcommonpth_a-userids.Po \
@@ -699,6 +702,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
@@ -878,19 +882,20 @@ 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 argparse.c argparse.h logging.c logging.h dotlock.c \
 	dotlock.h mischelp.c mischelp.h status.c status.h shareddefs.h \
-	openpgpdefs.h gc-opt-flags.h sexp-parse.h tlv.c tlv.h 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 ssh-utils.c \
-	ssh-utils.h agent-opt.c helpfile.c mkdir_p.c mkdir_p.h \
-	strlist.c strlist.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 compliance.c \
-	compliance.h $(am__append_9) $(am__append_10) $(am__append_11) \
+	openpgpdefs.h 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 ssh-utils.c ssh-utils.h agent-opt.c \
+	helpfile.c mkdir_p.c mkdir_p.h strlist.c strlist.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 compliance.c compliance.h \
+	$(am__append_9) $(am__append_10) $(am__append_11) \
 	$(am__append_12)
 
 # Sources only useful without NPTH.
@@ -1177,6 +1182,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-stringhelp.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-strlist.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-sysutils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-tlv-builder.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-tlv.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-ttyio.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommon_a-userids.Po@am__quote@ # am--include-marker
@@ -1232,6 +1238,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-stringhelp.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-strlist.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-sysutils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-tlv-builder.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-tlv.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-ttyio.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcommonpth_a-userids.Po@am__quote@ # am--include-marker
@@ -1444,6 +1451,20 @@ libcommon_a-tlv.obj: tlv.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-tlv.obj `if test -f 'tlv.c'; then $(CYGPATH_W) 'tlv.c'; else $(CYGPATH_W) '$(srcdir)/tlv.c'; fi`
 
+libcommon_a-tlv-builder.o: tlv-builder.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-tlv-builder.o -MD -MP -MF $(DEPDIR)/libcommon_a-tlv-builder.Tpo -c -o libcommon_a-tlv-builder.o `test -f 'tlv-builder.c' || echo '$(srcdir)/'`tlv-builder.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-tlv-builder.Tpo $(DEPDIR)/libcommon_a-tlv-builder.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tlv-builder.c' object='libcommon_a-tlv-builder.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-tlv-builder.o `test -f 'tlv-builder.c' || echo '$(srcdir)/'`tlv-builder.c
+
+libcommon_a-tlv-builder.obj: tlv-builder.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-tlv-builder.obj -MD -MP -MF $(DEPDIR)/libcommon_a-tlv-builder.Tpo -c -o libcommon_a-tlv-builder.obj `if test -f 'tlv-builder.c'; then $(CYGPATH_W) 'tlv-builder.c'; else $(CYGPATH_W) '$(srcdir)/tlv-builder.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-tlv-builder.Tpo $(DEPDIR)/libcommon_a-tlv-builder.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tlv-builder.c' object='libcommon_a-tlv-builder.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -c -o libcommon_a-tlv-builder.obj `if test -f 'tlv-builder.c'; then $(CYGPATH_W) 'tlv-builder.c'; else $(CYGPATH_W) '$(srcdir)/tlv-builder.c'; fi`
+
 libcommon_a-init.o: init.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommon_a_CFLAGS) $(CFLAGS) -MT libcommon_a-init.o -MD -MP -MF $(DEPDIR)/libcommon_a-init.Tpo -c -o libcommon_a-init.o `test -f 'init.c' || echo '$(srcdir)/'`init.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcommon_a-init.Tpo $(DEPDIR)/libcommon_a-init.Po
@@ -2214,6 +2235,20 @@ libcommonpth_a-tlv.obj: tlv.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-tlv.obj `if test -f 'tlv.c'; then $(CYGPATH_W) 'tlv.c'; else $(CYGPATH_W) '$(srcdir)/tlv.c'; fi`
 
+libcommonpth_a-tlv-builder.o: tlv-builder.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-tlv-builder.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-tlv-builder.Tpo -c -o libcommonpth_a-tlv-builder.o `test -f 'tlv-builder.c' || echo '$(srcdir)/'`tlv-builder.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-tlv-builder.Tpo $(DEPDIR)/libcommonpth_a-tlv-builder.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tlv-builder.c' object='libcommonpth_a-tlv-builder.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-tlv-builder.o `test -f 'tlv-builder.c' || echo '$(srcdir)/'`tlv-builder.c
+
+libcommonpth_a-tlv-builder.obj: tlv-builder.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-tlv-builder.obj -MD -MP -MF $(DEPDIR)/libcommonpth_a-tlv-builder.Tpo -c -o libcommonpth_a-tlv-builder.obj `if test -f 'tlv-builder.c'; then $(CYGPATH_W) 'tlv-builder.c'; else $(CYGPATH_W) '$(srcdir)/tlv-builder.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-tlv-builder.Tpo $(DEPDIR)/libcommonpth_a-tlv-builder.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tlv-builder.c' object='libcommonpth_a-tlv-builder.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -c -o libcommonpth_a-tlv-builder.obj `if test -f 'tlv-builder.c'; then $(CYGPATH_W) 'tlv-builder.c'; else $(CYGPATH_W) '$(srcdir)/tlv-builder.c'; fi`
+
 libcommonpth_a-init.o: init.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcommonpth_a_CFLAGS) $(CFLAGS) -MT libcommonpth_a-init.o -MD -MP -MF $(DEPDIR)/libcommonpth_a-init.Tpo -c -o libcommonpth_a-init.o `test -f 'init.c' || echo '$(srcdir)/'`init.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libcommonpth_a-init.Tpo $(DEPDIR)/libcommonpth_a-init.Po
@@ -3128,6 +3163,7 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/libcommon_a-stringhelp.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-strlist.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-sysutils.Po
+	-rm -f ./$(DEPDIR)/libcommon_a-tlv-builder.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-tlv.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-ttyio.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-userids.Po
@@ -3183,6 +3219,7 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/libcommonpth_a-stringhelp.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-strlist.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-sysutils.Po
+	-rm -f ./$(DEPDIR)/libcommonpth_a-tlv-builder.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-tlv.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-ttyio.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-userids.Po
@@ -3311,6 +3348,7 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/libcommon_a-stringhelp.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-strlist.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-sysutils.Po
+	-rm -f ./$(DEPDIR)/libcommon_a-tlv-builder.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-tlv.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-ttyio.Po
 	-rm -f ./$(DEPDIR)/libcommon_a-userids.Po
@@ -3366,6 +3404,7 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/libcommonpth_a-stringhelp.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-strlist.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-sysutils.Po
+	-rm -f ./$(DEPDIR)/libcommonpth_a-tlv-builder.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-tlv.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-ttyio.Po
 	-rm -f ./$(DEPDIR)/libcommonpth_a-userids.Po
diff --git a/common/argparse.c b/common/argparse.c
index fb2bc65..b63f800 100644
--- a/common/argparse.c
+++ b/common/argparse.c
@@ -1344,6 +1344,17 @@ gnupg_argparse (estream_t fp, gnupg_argparse_t *arg, gnupg_opt_t *opts_orig)
                         xfree (buffer);
                       else
                         gpgrt_annotate_leaked_object (buffer);
+                      /* If the caller wants us to return the attributes or
+                       * ignored options, or these flags in. */
+                      if ((arg->flags & ARGPARSE_FLAG_WITHATTR))
+                        {
+                          if (opts[idx].ignore)
+                            arg->r_type |= ARGPARSE_ATTR_IGNORE;
+                          if (opts[idx].forced)
+                            arg->r_type |= ARGPARSE_ATTR_FORCE;
+                          if (set_ignore)
+                            arg->r_type |= ARGPARSE_OPT_IGNORE;
+                        }
                     }
                 }
               goto leave;
diff --git a/common/dotlock.c b/common/dotlock.c
index 4320c54..772bda3 100644
--- a/common/dotlock.c
+++ b/common/dotlock.c
@@ -124,7 +124,7 @@
    that the handle shall only be used by one thread at a time.  This
    function creates a unique file temporary file (".#lk*") in the same
    directory as FNAME and returns a handle for further operations.
-   The module keeps track of theses unique files so that they will be
+   The module keeps track of these unique files so that they will be
    unlinked using the atexit handler.  If you don't need the lock file
    anymore, you may also explicitly remove it with a call to:
 
@@ -140,7 +140,7 @@
    you pass (0) instead of (-1) the function does not wait in case the
    file is already locked but returns -1 and sets ERRNO to EACCES.
    Any other positive value for the second parameter is considered a
-   timeout valuie in milliseconds.
+   timeout value in milliseconds.
 
    To release the lock you call:
 
@@ -526,7 +526,7 @@ maybe_deadlock (dotlock_t h)
    has been created on the same node. */
 #ifdef HAVE_POSIX_SYSTEM
 static int
-read_lockfile (dotlock_t h, int *same_node )
+read_lockfile (dotlock_t h, int *same_node, int *r_fd)
 {
   char buffer_space[10+1+70+1]; /* 70 is just an estimated value; node
                                    names are usually shorter. */
@@ -579,7 +579,11 @@ read_lockfile (dotlock_t h, int *same_node )
       nread += res;
     }
   while (res && nread != expected_len);
-  close(fd);
+
+  if (r_fd)
+    *r_fd = fd;
+  else
+    close(fd);
 
   if (nread < 11)
     {
@@ -1035,13 +1039,12 @@ dotlock_take_unix (dotlock_t h, long timeout)
   const char *maybe_dead="";
   int same_node;
   int saveerrno;
+  int fd;
 
  again:
   if (h->use_o_excl)
     {
       /* No hardlink support - use open(O_EXCL).  */
-      int fd;
-
       do
         {
           my_set_errno (0);
@@ -1111,7 +1114,7 @@ dotlock_take_unix (dotlock_t h, long timeout)
     }
 
   /* Check for stale lock files.  */
-  if ( (pid = read_lockfile (h, &same_node)) == -1 )
+  if ( (pid = read_lockfile (h, &same_node, &fd)) == -1 )
     {
       if ( errno != ENOENT )
         {
@@ -1123,22 +1126,56 @@ dotlock_take_unix (dotlock_t h, long timeout)
       my_info_0 ("lockfile disappeared\n");
       goto again;
     }
-  else if ( pid == getpid() && same_node )
+  else if ( (pid == getpid() && same_node)
+            || (same_node && kill (pid, 0) && errno == ESRCH) )
+    /* Stale lockfile is detected. */
     {
-      my_info_0 ("Oops: lock already held by us\n");
-      h->locked = 1;
-      return 0; /* okay */
-    }
-  else if ( same_node && kill (pid, 0) && errno == ESRCH )
-    {
-      /* Note: It is unlikley that we get a race here unless a pid is
-         reused too fast or a new process with the same pid as the one
-         of the stale file tries to lock right at the same time as we.  */
-      my_info_1 (_("removing stale lockfile (created by %d)\n"), pid);
+      struct stat sb;
+
+      /* Check if it's unlocked during examining the lockfile.  */
+      if (fstat (fd, &sb) || sb.st_nlink == 0)
+        {
+          /* It's gone already by another process.  */
+          close (fd);
+          goto again;
+        }
+
+      /*
+       * Here, although it's quite _rare_, we have a race condition.
+       *
+       * When multiple processes race on a stale lockfile, detecting
+       * AND removing should be done atomically.  That is, to work
+       * correctly, the file to be removed should be the one which is
+       * examined for detection.
+       *
+       * But, when it's not atomic, consider the case for us where it
+       * takes some time between the detection and the removal of the
+       * lockfile.
+       *
+       * In this situation, it is possible that the file which was
+       * detected as stale is already removed by another process and
+       * then new lockfile is created (by that process or other one).
+       *
+       * And it is newly created valid lockfile which is going to be
+       * removed by us.
+       *
+       * Consider this long comment as it expresses possible (long)
+       * time between fstat above and unlink below; Meanwhile, the
+       * lockfile in question may be removed and there may be new
+       * valid one.
+       *
+       * In short, when you see the message of removing stale lockfile
+       * when there are multiple processes for the work, there is
+       * (very) little possibility something went wrong.
+       */
+
       unlink (h->lockname);
+      my_info_1 (_("removing stale lockfile (created by %d)\n"), pid);
+      close (fd);
       goto again;
     }
 
+  close (fd);
   if (lastpid == -1)
     lastpid = pid;
   ownerchanged = (pid != lastpid);
@@ -1250,7 +1287,7 @@ dotlock_take_w32 (dotlock_t h, long timeout)
 
 
 /* Take a lock on H.  A value of 0 for TIMEOUT returns immediately if
-   the lock can't be taked, -1 waits forever (hopefully not), other
+   the lock can't be taken, -1 waits forever (hopefully not), other
    values wait for TIMEOUT milliseconds.  Returns: 0 on success  */
 int
 dotlock_take (dotlock_t h, long timeout)
@@ -1288,7 +1325,7 @@ dotlock_release_unix (dotlock_t h)
   int pid, same_node;
   int saveerrno;
 
-  pid = read_lockfile (h, &same_node);
+  pid = read_lockfile (h, &same_node, NULL);
   if ( pid == -1 )
     {
       saveerrno = errno;
diff --git a/common/dynload.h b/common/dynload.h
index 54a47b2..f1dc3f0 100644
--- a/common/dynload.h
+++ b/common/dynload.h
@@ -34,6 +34,9 @@
 #ifndef __MINGW32__
 # include <dlfcn.h>
 #else
+# ifdef HAVE_WINSOCK2_H
+#  include <winsock2.h>  /* needs to be included before windows.h */
+# endif
 # include <windows.h>
 # include "utf8conv.h"
 # include "mischelp.h"
diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c
index 347a11b..e9cb7ed 100644
--- a/common/exechelp-posix.c
+++ b/common/exechelp-posix.c
@@ -276,16 +276,21 @@ get_all_open_fds (void)
 static void
 do_exec (const char *pgmname, const char *argv[],
          int fd_in, int fd_out, int fd_err,
-         int *except, void (*preexec)(void) )
+         int *except, void (*preexec)(void), unsigned int flags)
 {
   char **arg_list;
   int i, j;
   int fds[3];
+  int nodevnull[3];
 
   fds[0] = fd_in;
   fds[1] = fd_out;
   fds[2] = fd_err;
 
+  nodevnull[0] = !!(flags & GNUPG_SPAWN_KEEP_STDIN);
+  nodevnull[1] = !!(flags & GNUPG_SPAWN_KEEP_STDOUT);
+  nodevnull[2] = !!(flags & GNUPG_SPAWN_KEEP_STDERR);
+
   /* Create the command line argument array.  */
   i = 0;
   if (argv)
@@ -304,7 +309,9 @@ do_exec (const char *pgmname, const char *argv[],
   /* Assign /dev/null to unused FDs. */
   for (i=0; i <= 2; i++)
     {
-      if (fds[i] == -1 )
+      if (nodevnull[i])
+        continue;
+      if (fds[i] == -1)
         {
           fds[i] = open ("/dev/null", i? O_WRONLY : O_RDONLY);
           if (fds[i] == -1)
@@ -316,6 +323,8 @@ do_exec (const char *pgmname, const char *argv[],
   /* Connect the standard files.  */
   for (i=0; i <= 2; i++)
     {
+      if (nodevnull[i])
+        continue;
       if (fds[i] != i && dup2 (fds[i], i) == -1)
         log_fatal ("dup2 std%s failed: %s\n",
                    i==0?"in":i==1?"out":"err", strerror (errno));
@@ -525,7 +534,7 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
       es_fclose (outfp);
       es_fclose (errfp);
       do_exec (pgmname, argv, inpipe[0], outpipe[1], errpipe[1],
-               except, preexec);
+               except, preexec, flags);
       /*NOTREACHED*/
     }
 
@@ -575,7 +584,7 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[],
     {
       gcry_control (GCRYCTL_TERM_SECMEM);
       /* Run child. */
-      do_exec (pgmname, argv, infd, outfd, errfd, NULL, NULL);
+      do_exec (pgmname, argv, infd, outfd, errfd, NULL, NULL, 0);
       /*NOTREACHED*/
     }
 
@@ -874,7 +883,7 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
         for (i=0; envp[i]; i++)
           putenv (xstrdup (envp[i]));
 
-      do_exec (pgmname, argv, -1, -1, -1, NULL, NULL);
+      do_exec (pgmname, argv, -1, -1, -1, NULL, NULL, 0);
 
       /*NOTREACHED*/
     }
diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c
index bdbea31..00cf3fc 100644
--- a/common/exechelp-w32.c
+++ b/common/exechelp-w32.c
@@ -544,11 +544,14 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
     return err;
 
   if (inpipe[0] == INVALID_HANDLE_VALUE)
-    nullhd[0] = w32_open_null (0);
+    nullhd[0] = ((flags & GNUPG_SPAWN_KEEP_STDIN)?
+                 GetStdHandle (STD_INPUT_HANDLE) : w32_open_null (0));
   if (outpipe[1] == INVALID_HANDLE_VALUE)
-    nullhd[1] = w32_open_null (1);
+    nullhd[1] = ((flags & GNUPG_SPAWN_KEEP_STDOUT)?
+                 GetStdHandle (STD_OUTPUT_HANDLE) : w32_open_null (1));
   if (errpipe[1] == INVALID_HANDLE_VALUE)
-    nullhd[2] = w32_open_null (1);
+    nullhd[2] = ((flags & GNUPG_SPAWN_KEEP_STDOUT)?
+                 GetStdHandle (STD_ERROR_HANDLE) : w32_open_null (1));
 
   /* Start the process.  Note that we can't run the PREEXEC function
      because this might change our own environment. */
diff --git a/common/exechelp.h b/common/exechelp.h
index 2b40ba0..1240fde 100644
--- a/common/exechelp.h
+++ b/common/exechelp.h
@@ -71,7 +71,9 @@ gpg_error_t gnupg_create_pipe (int filedes[2]);
 #define GNUPG_SPAWN_NONBLOCK   16
 #define GNUPG_SPAWN_RUN_ASFW   64
 #define GNUPG_SPAWN_DETACHED  128
-
+#define GNUPG_SPAWN_KEEP_STDIN   256
+#define GNUPG_SPAWN_KEEP_STDOUT  512
+#define GNUPG_SPAWN_KEEP_STDERR 1024
 
 /* Fork and exec the program PGMNAME.
 
@@ -117,6 +119,12 @@ gpg_error_t gnupg_create_pipe (int filedes[2]);
           the child.  Note that due to unknown problems this actually
           allows SetForegroundWindow for all children of this process.
 
+   GNUPG_SPAWN_KEEP_STDIN
+   GNUPG_SPAWN_KEEP_STDOUT
+   GNUPG_SPAWN_KEEP_STDERR
+          Do not assign /dev/null to a non-required standard file
+          descriptor.
+
  */
 gpg_error_t
 gnupg_spawn_process (const char *pgmname, const char *argv[],
diff --git a/common/gc-opt-flags.h b/common/gc-opt-flags.h
index 11ecec0..8458aa0 100644
--- a/common/gc-opt-flags.h
+++ b/common/gc-opt-flags.h
@@ -20,10 +20,6 @@
 
 #define GC_OPT_FLAG_NONE	0UL
 
-/* The RUNTIME flag for an option indicates that the option can be
-   changed at runtime.  */
-#define GC_OPT_FLAG_RUNTIME	(1UL << 3)
-
 /* The DEFAULT flag for an option indicates that the option has a
    default value.  */
 #define GC_OPT_FLAG_DEFAULT	(1UL << 4)
diff --git a/common/homedir.c b/common/homedir.c
index 70507b5..9788c22 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -112,25 +112,6 @@ static const char *w32_rootdir (void);
 #endif
 
 
-
-#ifdef HAVE_W32_SYSTEM
-static void
-w32_try_mkdir (const char *dir)
-{
-#ifdef HAVE_W32CE_SYSTEM
-  wchar_t *wdir = utf8_to_wchar (dir);
-  if (wdir)
-    {
-      CreateDirectory (wdir, NULL);
-      xfree (wdir);
-    }
-#else
-  CreateDirectory (dir, NULL);
-#endif
-}
-#endif
-
-
 /* This is a helper function to load and call a Windows function from
  * either of one DLLs.  On success an UTF-8 file name is returned.
  * ERRNO is _not_ set on error.  */
@@ -275,7 +256,7 @@ standard_homedir (void)
 
               /* Try to create the directory if it does not yet exists.  */
               if (gnupg_access (dir, F_OK))
-                w32_try_mkdir (dir);
+                gnupg_mkdir (dir, "-rwx");
             }
           else
             dir = GNUPG_DEFAULT_HOMEDIR;
@@ -860,7 +841,7 @@ _gnupg_socketdir_internal (int skip_checks, unsigned *r_info)
           name = xstrconcat (path, "\\gnupg", NULL);
           xfree (path);
           if (gnupg_access (name, F_OK))
-            w32_try_mkdir (name);
+            gnupg_mkdir (name, "-rwx");
         }
       else
         {
diff --git a/common/iobuf.c b/common/iobuf.c
index 4fd8cf5..07edbbe 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -194,18 +194,6 @@ fd_cache_strcmp (const char *a, const char *b)
 }
 
 
-#ifdef HAVE_W32_SYSTEM
-static int
-any8bitchar (const char *string)
-{
-  if (string)
-    for ( ; *string; string++)
-      if ((*string & 0x80))
-        return 1;
-  return 0;
-}
-#endif /*HAVE_W32_SYSTEM*/
-
 /*
  * Invalidate (i.e. close) a cached iobuf
  */
@@ -307,11 +295,11 @@ direct_open (const char *fname, const char *mode, int mode700)
       sm = FILE_SHARE_READ;
     }
 
-  /* We use the Unicode version of the function only if needed to
-   * avoid an extra conversion step.  */
-  if (any8bitchar (fname))
+  /* We always use the Unicode version because it supports file names
+   * longer than MAX_PATH.  (requires gpgrt 1.45) */
+  if (1)
     {
-      wchar_t *wfname = utf8_to_wchar (fname);
+      wchar_t *wfname = gpgrt_fname_to_wchar (fname);
       if (wfname)
         {
           hfile = CreateFileW (wfname, da, sm, NULL, cd,
@@ -321,8 +309,6 @@ direct_open (const char *fname, const char *mode, int mode700)
       else
         hfile = INVALID_HANDLE_VALUE;
     }
-  else
-    hfile = CreateFileA (fname, da, sm, NULL, cd, FILE_ATTRIBUTE_NORMAL, NULL);
 
   return hfile;
 
@@ -1211,14 +1197,7 @@ iobuf_cancel (iobuf_t a)
     {
       /* Argg, MSDOS does not allow removing open files.  So
        * we have to do it here */
-#ifdef HAVE_W32CE_SYSTEM
-      wchar_t *wtmp = utf8_to_wchar (remove_name);
-      if (wtmp)
-        DeleteFile (wtmp);
-      xfree (wtmp);
-#else
-      remove (remove_name);
-#endif
+      gnupg_remove (remove_name);
       xfree (remove_name);
     }
 #endif
diff --git a/common/mapstrings.c b/common/mapstrings.c
index 614fddd..16da48e 100644
--- a/common/mapstrings.c
+++ b/common/mapstrings.c
@@ -68,6 +68,18 @@ struct mapping_s
 static struct mapping_s *mappings;
 
 
+/* Similar to above but using two integers and a domain as key.  */
+struct intmapping_s
+{
+  struct intmapping_s *next;
+  int key1;
+  int key2;
+  const char *string;
+  char domain[1];
+};
+static struct intmapping_s *intmappings;
+
+
 /* If STRING has already been mapped, return the mapped string.  If
    not return NULL.  */
 static const char *
@@ -165,3 +177,40 @@ map_static_macro_string (const char *string)
 
   return store_mapping (string, p);
 }
+
+
+/* If a list of strings has already been mapped to a the tuple
+ * (DOMAIN,KEY1,KEY2) return that string.  If not, create a mapping
+ * made up of the concatenation of the given strings.  */
+const char *
+map_static_strings (const char *domain, int key1, int key2,
+                    const char *string1, ...)
+{
+  va_list arg_ptr;
+  struct intmapping_s *m;
+
+  if (!string1 || !domain)
+    return "";
+
+  for (m = intmappings; m; m = m->next)
+    if (m->key1 == key1 && m->key2 == key2 && !strcmp (domain, m->domain))
+      return m->string;
+
+  m = xmalloc (sizeof *m + strlen (domain));
+  strcpy (m->domain, domain);
+  m->key1 = key1;
+  m->key2 = key2;
+
+  va_start (arg_ptr, string1);
+  m->string = vstrconcat (string1, arg_ptr);
+  va_end (arg_ptr);
+  if (!m->string)
+    log_fatal ("map_static_strings failed: %s\n", strerror (errno));
+
+  gpgrt_annotate_leaked_object (m->string);
+  gpgrt_annotate_leaked_object (m);
+
+  m->next = intmappings;
+  intmappings = m;
+  return m->string;
+}
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
index af1f277..c377554 100644
--- a/common/miscellaneous.c
+++ b/common/miscellaneous.c
@@ -117,6 +117,65 @@ xoutofcore (void)
 }
 
 
+/* This is safe version of realloc useful for reallocing a calloced
+ * array.  There are two ways to call it:  The first example
+ * reallocates the array A to N elements each of SIZE but does not
+ * clear the newly allocated elements:
+ *
+ *  p = gpgrt_reallocarray (a, n, n, nsize);
+ *
+ * Note that when NOLD is larger than N no cleaning is needed anyway.
+ * The second example reallocates an array of size NOLD to N elements
+ * each of SIZE but clear the newly allocated elements:
+ *
+ *  p = gpgrt_reallocarray (a, nold, n, nsize);
+ *
+ * Note that gnupg_reallocarray (NULL, 0, n, nsize) is equivalent to
+ * gcry_calloc (n, nsize).
+ */
+void *
+gnupg_reallocarray (void *a, size_t oldnmemb, size_t nmemb, size_t size)
+{
+  size_t oldbytes, bytes;
+  char *p;
+
+  bytes = nmemb * size; /* size_t is unsigned so the behavior on overflow
+                         * is defined. */
+  if (size && bytes / size != nmemb)
+    {
+      gpg_err_set_errno (ENOMEM);
+      return NULL;
+    }
+
+  p = gcry_realloc (a, bytes);
+  if (p && oldnmemb < nmemb)
+    {
+      /* OLDNMEMBS is lower than NMEMB thus the user asked for a
+         calloc.  Clear all newly allocated members.  */
+      oldbytes = oldnmemb * size;
+      if (size && oldbytes / size != oldnmemb)
+        {
+          xfree (p);
+          gpg_err_set_errno (ENOMEM);
+          return NULL;
+        }
+      memset (p + oldbytes, 0, bytes - oldbytes);
+    }
+  return p;
+}
+
+
+/* Die-on-error version of gnupg_reallocarray.   */
+void *
+xreallocarray (void *a, size_t oldnmemb, size_t nmemb, size_t size)
+{
+  void *p = gnupg_reallocarray (a, oldnmemb, nmemb, size);
+  if (!p)
+    xoutofcore ();
+  return p;
+}
+
+
 /* A wrapper around gcry_cipher_algo_name to return the string
    "AES-128" instead of "AES".  Given that we have an alias in
    libgcrypt for it, it does not harm to too much to return this other
@@ -701,3 +760,83 @@ parse_debug_flag (const char *string, unsigned int *debugvar,
   *debugvar |= result;
   return 0;
 }
+
+
+
+/* Parse an --comaptibility_flags style argument consisting of comma
+ * separated strings.
+ *
+ * Returns: 0 on success or -1 and ERRNO set on error.  On success the
+ *          supplied variable is updated by the parsed flags.
+ *
+ * If STRING is NULL the enabled flags are printed.
+ */
+int
+parse_compatibility_flags (const char *string, unsigned int *flagvar,
+                           const struct compatibility_flags_s *flags)
+
+{
+  unsigned long result = 0;
+  int i, j;
+
+  if (!string)
+    {
+      if (flagvar)
+        {
+          log_info ("enabled compatibility flags:");
+          for (i=0; flags[i].name; i++)
+            if ((*flagvar & flags[i].flag))
+              log_printf (" %s", flags[i].name);
+          log_printf ("\n");
+        }
+      return 0;
+    }
+
+  while (spacep (string))
+    string++;
+
+  if (!strcmp (string, "?") || !strcmp (string, "help"))
+    {
+      log_info ("available compatibility flags:\n");
+      for (i=0; flags[i].name; i++)
+        log_info (" %s\n", flags[i].name);
+      if (flags[i].flag != 77)
+        exit (0);
+    }
+  else
+    {
+      char **words;
+      words = strtokenize (string, ",");
+      if (!words)
+        return -1;
+      for (i=0; words[i]; i++)
+        {
+          if (*words[i])
+            {
+              for (j=0; flags[j].name; j++)
+                if (!strcmp (words[i], flags[j].name))
+                  {
+                    result |= flags[j].flag;
+                    break;
+                  }
+              if (!flags[j].name)
+                {
+                  if (!strcmp (words[i], "none"))
+                    {
+                      *flagvar = 0;
+                      result = 0;
+                    }
+                  else if (!strcmp (words[i], "all"))
+                    result = ~0;
+                  else
+                    log_info ("unknown compatibility flag '%s' ignored\n",
+                              words[i]);
+                }
+            }
+        }
+      xfree (words);
+    }
+
+  *flagvar |= result;
+  return 0;
+}
diff --git a/common/mischelp.c b/common/mischelp.c
index 81dd501..ee85002 100644
--- a/common/mischelp.c
+++ b/common/mischelp.c
@@ -80,35 +80,30 @@ same_file_p (const char *name1, const char *name2)
 #ifdef HAVE_W32_SYSTEM
       HANDLE file1, file2;
       BY_HANDLE_FILE_INFORMATION info1, info2;
+      wchar_t *wname;
+
+      wname = gpgrt_fname_to_wchar (name1);
+      if (wname)
+        {
+          file1 = CreateFileW (wname, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
+          xfree (wname);
+        }
+      else
+        file1 = INVALID_HANDLE_VALUE;
 
-#ifdef HAVE_W32CE_SYSTEM
-      {
-        wchar_t *wname = utf8_to_wchar (name1);
-        if (wname)
-          file1 = CreateFile (wname, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-        else
-          file1 = INVALID_HANDLE_VALUE;
-        xfree (wname);
-      }
-#else
-      file1 = CreateFile (name1, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-#endif
       if (file1 == INVALID_HANDLE_VALUE)
         yes = 0; /* If we can't open the file, it is not the same.  */
       else
         {
-#ifdef HAVE_W32CE_SYSTEM
-          {
-            wchar_t *wname = utf8_to_wchar (name2);
-            if (wname)
-              file2 = CreateFile (wname, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-            else
-              file2 = INVALID_HANDLE_VALUE;
-            xfree (wname);
-          }
-#else
-          file2 = CreateFile (name2, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-#endif
+          wname = gpgrt_fname_to_wchar (name2);
+          if (wname)
+            {
+              file2 = CreateFileW (wname, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
+              xfree (wname);
+            }
+          else
+            file2 = INVALID_HANDLE_VALUE;
+
           if (file2 == INVALID_HANDLE_VALUE)
             yes = 0; /* If we can't open the file, it is not the same.  */
           else
diff --git a/common/name-value.c b/common/name-value.c
index f97396b..0e9e49c 100644
--- a/common/name-value.c
+++ b/common/name-value.c
@@ -476,24 +476,33 @@ nvc_set (nvc_t pk, const char *name, const char *value)
 
   e = nvc_lookup (pk, name);
   if (e)
-    {
-      char *v;
+    return nve_set (e, value);
+  else
+    return nvc_add (pk, name, value);
+}
 
-      v = xtrystrdup (value);
-      if (v == NULL)
-	return my_error_from_syserror ();
 
-      free_strlist_wipe (e->raw_value);
-      e->raw_value = NULL;
-      if (e->value)
-	wipememory (e->value, strlen (e->value));
-      xfree (e->value);
-      e->value = v;
+/* Update entry E to VALUE.  */
+gpg_error_t
+nve_set (nve_t e, const char *value)
+{
+  char *v;
 
-      return 0;
-    }
-  else
-    return nvc_add (pk, name, value);
+  if (!e)
+    return GPG_ERR_INV_ARG;
+
+  v = xtrystrdup (value? value:"");
+  if (!v)
+    return my_error_from_syserror ();
+
+  free_strlist_wipe (e->raw_value);
+  e->raw_value = NULL;
+  if (e->value)
+    wipememory (e->value, strlen (e->value));
+  xfree (e->value);
+  e->value = v;
+
+  return 0;
 }
 
 
@@ -514,6 +523,20 @@ nvc_delete (nvc_t pk, nve_t entry)
   nve_release (entry, pk->private_key_mode);
 }
 
+/* Delete the entries with NAME from PK.  */
+void
+nvc_delete_named (nvc_t pk, const char *name)
+{
+  nve_t e;
+
+  if (!valid_name (name))
+    return;
+
+  while ((e = nvc_lookup (pk, name)))
+    nvc_delete (pk, e);
+}
+
+
 
 
 /* Lookup and iteration.  */
@@ -563,6 +586,46 @@ nve_next_value (nve_t entry, const char *name)
   return NULL;
 }
 
+
+/* Return the string for the first entry in NVC with NAME.  If an
+ * entry with NAME is missing in NVC or its value is the empty string
+ * NULL is returned.  Note that the returned string is a pointer
+ * into NVC.  */
+const char *
+nvc_get_string (nvc_t nvc, const char *name)
+{
+  nve_t item;
+
+  if (!nvc)
+    return NULL;
+  item = nvc_lookup (nvc, name);
+  if (!item)
+    return NULL;
+  return nve_value (item);
+}
+
+
+/* Return true if NAME exists and its value is true; that is either
+ * "yes", "true", or a decimal value unequal to 0.  */
+int
+nvc_get_boolean (nvc_t nvc, const char *name)
+{
+  nve_t item;
+  const char *s;
+
+  if (!nvc)
+    return 0;
+  item = nvc_lookup (nvc, name);
+  if (!item)
+    return 0;
+  s = nve_value (item);
+  if (s && (atoi (s)
+            || !ascii_strcasecmp (s, "yes")
+            || !ascii_strcasecmp (s, "true")))
+    return 1;
+  return 0;
+}
+
 
 
 /* Private key handling.  */
@@ -779,29 +842,56 @@ nvc_parse_private_key (nvc_t *result, int *errlinep, estream_t stream)
 }
 
 
+/* Helper fpr nvc_write.  */
+static gpg_error_t
+write_one_entry (nve_t entry, estream_t stream)
+{
+  gpg_error_t err;
+  strlist_t sl;
+
+  if (entry->name)
+    es_fputs (entry->name, stream);
+
+  err = assert_raw_value (entry);
+  if (err)
+    return err;
+
+  for (sl = entry->raw_value; sl; sl = sl->next)
+    es_fputs (sl->d, stream);
+
+  if (es_ferror (stream))
+    return my_error_from_syserror ();
+
+  return 0;
+}
+
+
 /* Write a representation of PK to STREAM.  */
 gpg_error_t
 nvc_write (nvc_t pk, estream_t stream)
 {
-  gpg_error_t err;
+  gpg_error_t err = 0;
   nve_t entry;
-  strlist_t s;
+  nve_t keyentry = NULL;
 
   for (entry = pk->first; entry; entry = entry->next)
     {
-      if (entry->name)
-	es_fputs (entry->name, stream);
-
-      err = assert_raw_value (entry);
+      if (pk->private_key_mode
+          && entry->name && !ascii_strcasecmp (entry->name, "Key:"))
+        {
+          if (!keyentry)
+            keyentry = entry;
+          continue;
+        }
+
+      err = write_one_entry (entry, stream);
       if (err)
 	return err;
-
-      for (s = entry->raw_value; s; s = s->next)
-	es_fputs (s->d, stream);
-
-      if (es_ferror (stream))
-	return my_error_from_syserror ();
     }
 
-  return 0;
+  /* In private key mode we write the Key always last.  */
+  if (keyentry)
+    err = write_one_entry (keyentry, stream);
+
+  return err;
 }
diff --git a/common/name-value.h b/common/name-value.h
index db9270a..fd0a98c 100644
--- a/common/name-value.h
+++ b/common/name-value.h
@@ -72,6 +72,12 @@ nve_t nve_next (nve_t entry);
 /* Get the next entry with the given name.  */
 nve_t nve_next_value (nve_t entry, const char *name);
 
+/* Return the string for the first entry in NVC with NAME or NULL.  */
+const char *nvc_get_string (nvc_t nvc, const char *name);
+
+/* Return a boolean value for the first entry in NVC with NAME.  */
+int nvc_get_boolean (nvc_t nvc, const char *name);
+
 
 
 /* Adding and modifying values.  */
@@ -85,9 +91,15 @@ gpg_error_t nvc_add (nvc_t pk, const char *name, const char *value);
    first entry is updated.  */
 gpg_error_t nvc_set (nvc_t pk, const char *name, const char *value);
 
+/* Update entry E to VALUE.  */
+gpg_error_t nve_set (nve_t e, const char *value);
+
 /* Delete the given entry from PK.  */
 void nvc_delete (nvc_t pk, nve_t pke);
 
+/* Delete the entries with NAME from PK.  */
+void nvc_delete_named (nvc_t pk, const char *name);
+
 
 
 /* Private key handling.  */
diff --git a/common/stringhelp.c b/common/stringhelp.c
index dc5911c..5baaa1b 100644
--- a/common/stringhelp.c
+++ b/common/stringhelp.c
@@ -1167,9 +1167,10 @@ try_percent_escape (const char *str, const char *extra)
 }
 
 
-
-static char *
-do_strconcat (const char *s1, va_list arg_ptr)
+/* Same as strconcat but takes a va_list.  Returns EINVAL if the list
+ * is too long, all other errors are due to an ENOMEM condition.  */
+char *
+vstrconcat (const char *s1, va_list arg_ptr)
 {
   const char *argv[48];
   size_t argc;
@@ -1214,7 +1215,7 @@ strconcat (const char *s1, ...)
   else
     {
       va_start (arg_ptr, s1);
-      result = do_strconcat (s1, arg_ptr);
+      result = vstrconcat (s1, arg_ptr);
       va_end (arg_ptr);
     }
   return result;
@@ -1233,7 +1234,7 @@ xstrconcat (const char *s1, ...)
   else
     {
       va_start (arg_ptr, s1);
-      result = do_strconcat (s1, arg_ptr);
+      result = vstrconcat (s1, arg_ptr);
       va_end (arg_ptr);
     }
   if (!result)
diff --git a/common/stringhelp.h b/common/stringhelp.h
index 16c1af3..84215c7 100644
--- a/common/stringhelp.h
+++ b/common/stringhelp.h
@@ -141,9 +141,12 @@ char *try_percent_escape (const char *str, const char *extra);
    NULL.  Returns a malloced buffer with the new string or NULL on a
    malloc error or if too many arguments are given.  */
 char *strconcat (const char *s1, ...) GPGRT_ATTR_SENTINEL(0);
+/* Same but taking a va_list.  */
+char *vstrconcat (const char *s1, va_list arg_ptr);
 /* Ditto, but die on error.  */
 char *xstrconcat (const char *s1, ...) GPGRT_ATTR_SENTINEL(0);
 
+
 char **strsplit (char *string, char delim, char replacement, int *count);
 
 /* Tokenize STRING using the set of delimiters in DELIM.  */
@@ -172,5 +175,7 @@ char *substitute_envvars (const char *string);
 
 /*-- mapstrings.c --*/
 const char *map_static_macro_string (const char *string);
+const char *map_static_strings (const char *domain, int key1, int key2,
+                                const char *string1, ...);
 
 #endif /*GNUPG_COMMON_STRINGHELP_H*/
diff --git a/common/sysutils.c b/common/sysutils.c
index 01f6542..5f54ae1 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -779,8 +779,12 @@ gnupg_allow_set_foregound_window (pid_t pid)
               "gnupg_allow_set_foregound_window", (unsigned long)pid);
 #if defined(HAVE_W32_SYSTEM) && !defined(HAVE_W32CE_SYSTEM)
   else if (!AllowSetForegroundWindow ((pid_t)pid == (pid_t)(-1)?ASFW_ANY:pid))
-    log_info ("AllowSetForegroundWindow(%lu) failed: %s\n",
-               (unsigned long)pid, w32_strerror (-1));
+    {
+      char *flags = getenv ("GNUPG_EXEC_DEBUG_FLAGS");
+      if (flags && (atoi (flags) & 2))
+        log_info ("AllowSetForegroundWindow(%lu) failed: %s\n",
+                  (unsigned long)pid, w32_strerror (-1));
+    }
 #endif
 }
 
diff --git a/common/t-mapstrings.c b/common/t-mapstrings.c
index 0856c3c..7dc6221 100644
--- a/common/t-mapstrings.c
+++ b/common/t-mapstrings.c
@@ -88,6 +88,31 @@ test_map_static_macro_string (void)
 }
 
 
+static void
+test_map_static_strings (void)
+{
+  const char *s, *s1;
+
+  s1 = map_static_strings ("mydomain", 0, 42,
+                           "This", " ", "is", " ", "my"," ","string", NULL);
+  if (strcmp (s1, "This is my string"))
+    fail (1);
+  s = map_static_strings ("mydomain", 0, 42,
+                          "This", " ", "is", " ", "my"," ","string", NULL);
+  if (strcmp (s1, s))
+    fail (2);
+  s = map_static_strings ("mydomain", 0, 42, "foo", NULL);
+  if (strcmp (s1, s))
+    fail (3);
+  s = map_static_strings ("mydomain", 1, 42, "foo 1.42", NULL);
+  if (!strcmp (s1, s))
+    fail (4);
+  s = map_static_strings ("xdomain", 1, 42, "foo 1.42 other domain", NULL);
+  if (!strcmp (s1, s))
+    fail (5);
+}
+
+
 int
 main (int argc, char **argv)
 {
@@ -95,6 +120,7 @@ main (int argc, char **argv)
   (void)argv;
 
   test_map_static_macro_string ();
+  test_map_static_strings ();
 
   return 0;
 }
diff --git a/common/t-w32-reg.c b/common/t-w32-reg.c
index 9665003..1a44e38 100644
--- a/common/t-w32-reg.c
+++ b/common/t-w32-reg.c
@@ -56,7 +56,7 @@ test_read_registry (void)
 
   string2 = read_w32_reg_string
     ("HKCU\\Software\\Microsoft\\Windows\\CurrentVersion"
-     "\\Internet Settings:User Agent");
+     "\\Internet Settings:User Agent", NULL);
   if (!string2)
     fail (1);
   fprintf (stderr, "User agent: %s\n", string2);
@@ -76,7 +76,7 @@ main (int argc, char **argv)
 {
   if (argc > 1)
     {
-      char *string = read_w32_reg_string (argv[1]);
+      char *string = read_w32_reg_string (argv[1], NULL);
       printf ("%s -> %s\n", argv[1], string? string : "(null)");
       xfree (string);
     }
diff --git a/common/tlv-builder.c b/common/tlv-builder.c
new file mode 100644
index 0000000..59e2691
--- /dev/null
+++ b/common/tlv-builder.c
@@ -0,0 +1,388 @@
+/* tlv-builder.c - Build DER encoded objects
+ * Copyright (C) 2020 g10 Code GmbH
+ *
+ * This file is part of GnuPG.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gpg-error.h>
+
+#include "util.h"
+#include "tlv.h"
+
+
+struct item_s
+{
+  int class;
+  int tag;
+  unsigned int is_constructed:1; /* This is a constructed element.  */
+  unsigned int is_stop:1;        /* This is a STOP item.            */
+  const void *value;
+  size_t valuelen;
+  char *buffer;                  /* Malloced space or NULL.  */
+};
+
+
+struct tlv_builder_s
+{
+  gpg_error_t error;      /* Last error.  */
+  int use_secure;         /* Use secure memory for the result.    */
+  size_t nallocateditems; /* Number of allocated items.  */
+  size_t nitems;          /* Number of used items.  */
+  struct item_s *items;   /* Array of items.  */
+  int laststop;           /* Used as return value of compute_length.  */
+};
+
+
+/* Allocate a new TLV Builder instance.  Returns NULL on error.  If
+ * SECURE is set the final object is stored in secure memory.  */
+tlv_builder_t
+tlv_builder_new (int secure)
+{
+  tlv_builder_t tb;
+
+  tb = xtrycalloc (1, sizeof *tb);
+  if (tb && secure)
+    tb->use_secure = 1;
+  return tb;
+}
+
+
+/* Make sure the array of items is large enough for one new item.
+ * Records any error in TB and returns true in that case.  */
+static int
+ensure_space (tlv_builder_t tb)
+{
+  struct item_s *newitems;
+
+  if (!tb || tb->error)
+    return 1;
+
+  if (tb->nitems == tb->nallocateditems)
+    {
+      tb->nallocateditems += 32;
+      newitems = gpgrt_reallocarray (tb->items, tb->nitems,
+                                     tb->nallocateditems, sizeof *newitems);
+      if (!newitems)
+        tb->error = gpg_error_from_syserror ();
+      else
+        tb->items = newitems;
+    }
+  return !!tb->error;
+}
+
+
+
+/* Add a new primitive element to the builder instance TB.  The
+ * element is described by CLASS, TAG, VALUE, and VALUEEN.  CLASS and
+ * TAG must describe a primitive element and (VALUE,VALUELEN) specify
+ * its value.  The value is a pointer and its object must not be
+ * changed as long as the instance TB exists.  For a TAG_NULL no vlaue
+ * is expected.  Errors are not returned but recorded for later
+ * retrieval.  */
+void
+tlv_builder_add_ptr (tlv_builder_t tb, int class, int tag,
+                     void *value, size_t valuelen)
+{
+  if (ensure_space (tb))
+    return;
+  tb->items[tb->nitems].class    = class;
+  tb->items[tb->nitems].tag      = tag;
+  tb->items[tb->nitems].value    = value;
+  tb->items[tb->nitems].valuelen = valuelen;
+  tb->nitems++;
+}
+
+
+/* This is the same as tlv_builder_add_ptr but it takes a copy of the
+ * value and thus the caller does not need to care about it.  */
+void
+tlv_builder_add_val (tlv_builder_t tb, int class, int tag,
+                     const void *value, size_t valuelen)
+{
+  void *p;
+
+  if (ensure_space (tb))
+    return;
+  if (!value || !valuelen)
+    {
+      tb->error = gpg_error (GPG_ERR_INV_VALUE);
+      return;
+    }
+  p = tb->use_secure? xtrymalloc_secure (valuelen) : xtrymalloc (valuelen);
+  if (!p)
+    {
+      tb->error = gpg_error_from_syserror ();
+      return;
+    }
+  memcpy (p, value, valuelen);
+  tb->items[tb->nitems].buffer   = p;
+  tb->items[tb->nitems].class    = class;
+  tb->items[tb->nitems].tag      = tag;
+  tb->items[tb->nitems].value    = p;
+  tb->items[tb->nitems].valuelen = valuelen;
+  tb->nitems++;
+}
+
+
+/* Add a new constructed object to the builder instance TB.  The
+ * object is described by CLASS and TAG which must describe a
+ * constructed object.  The elements of the constructed objects are
+ * added with more call to the add functions.  To close a constructed
+ * element a call to tlv_builer_add_end is required.  Errors are not
+ * returned but recorded for later retrieval.  */
+void
+tlv_builder_add_tag (tlv_builder_t tb, int class, int tag)
+{
+  if (ensure_space (tb))
+    return;
+  tb->items[tb->nitems].class    = class;
+  tb->items[tb->nitems].tag      = tag;
+  tb->items[tb->nitems].is_constructed = 1;
+  tb->nitems++;
+}
+
+
+/* A call to this function closes a constructed element.  This must be
+ * called even for an empty constructed element.  */
+void
+tlv_builder_add_end (tlv_builder_t tb)
+{
+  if (ensure_space (tb))
+    return;
+  tb->items[tb->nitems].is_stop = 1;
+  tb->nitems++;
+}
+
+
+/* Compute and set the length of all constructed elements in the item
+ * array of TB starting at IDX up to the corresponding stop item.  On
+ * error tb->error is set.  */
+static size_t
+compute_lengths (tlv_builder_t tb, int idx)
+{
+  size_t total = 0;
+
+  if (tb->error)
+    return 0;
+
+  for (; idx < tb->nitems; idx++)
+    {
+      if (tb->items[idx].is_stop)
+        {
+          tb->laststop = idx;
+          break;
+        }
+      if (tb->items[idx].is_constructed)
+        {
+          tb->items[idx].valuelen = compute_lengths (tb, idx+1);
+          if (tb->error)
+            return 0;
+          /* Note: The last processed IDX is stored at tb->LASTSTOP.  */
+        }
+      total += get_tlv_length (tb->items[idx].class, tb->items[idx].tag,
+                               tb->items[idx].is_constructed,
+                               tb->items[idx].valuelen);
+      if (tb->items[idx].is_constructed)
+        idx = tb->laststop;
+    }
+  return total;
+}
+
+
+/* Return the constructed DER encoding and release this instance.  On
+ * success the object is stored at R_OBJ and its length at R_OBJLEN.
+ * The caller needs to release that memory.  On error NULL is stored
+ * at R_OBJ and an error code is returned.  Note than an error may
+ * stem from any of the previous call made to this object or from
+ * constructing the the DER object.  */
+gpg_error_t
+tlv_builder_finalize (tlv_builder_t tb, void **r_obj, size_t *r_objlen)
+{
+  gpg_error_t err;
+  membuf_t  mb;
+  int mb_initialized = 0;
+  int idx;
+
+  *r_obj = NULL;
+  *r_objlen = 0;
+
+  if (!tb)
+    return gpg_error (GPG_ERR_INTERNAL);
+  if (tb->error)
+    {
+      err = tb->error;
+      goto leave;
+    }
+  if (!tb->nitems || !tb->items[tb->nitems-1].is_stop)
+    {
+      err = gpg_error (GPG_ERR_NO_OBJ);
+      goto leave;
+    }
+
+  compute_lengths (tb, 0);
+  err = tb->error;
+  if (err)
+    goto leave;
+
+  /* for (idx=0; idx < tb->nitems; idx++) */
+  /*   log_debug ("TLVB[%2d]: c=%d t=%2d %s p=%p l=%zu\n", */
+  /*              idx, */
+  /*              tb->items[idx].class, */
+  /*              tb->items[idx].tag, */
+  /*              tb->items[idx].is_stop? "stop": */
+  /*              tb->items[idx].is_constructed? "cons":"prim", */
+  /*              tb->items[idx].value, */
+  /*              tb->items[idx].valuelen); */
+
+  if (tb->use_secure)
+    init_membuf_secure (&mb, 512);
+  else
+    init_membuf (&mb, 512);
+  mb_initialized = 1;
+
+  for (idx=0; idx < tb->nitems; idx++)
+    {
+      if (tb->items[idx].is_stop)
+        continue;
+      put_tlv_to_membuf (&mb, tb->items[idx].class, tb->items[idx].tag,
+                         tb->items[idx].is_constructed,
+                         tb->items[idx].valuelen);
+      if (tb->items[idx].value)
+        put_membuf (&mb, tb->items[idx].value, tb->items[idx].valuelen);
+    }
+
+  *r_obj = get_membuf (&mb, r_objlen);
+  if (!*r_obj)
+    err = gpg_error_from_syserror ();
+  mb_initialized = 0;
+
+ leave:
+  if (mb_initialized)
+    xfree (get_membuf (&mb, NULL));
+  for (idx=0; idx < tb->nitems; idx++)
+    xfree (tb->items[idx].buffer);
+  xfree (tb->items);
+  xfree (tb);
+  return err;
+}
+
+
+/* Write TAG of CLASS to MEMBUF.  CONSTRUCTED is a flag telling
+ * whether the value is constructed.  LENGTH gives the length of the
+ * value, if it is 0 undefinite length is assumed.  LENGTH is ignored
+ * for the NULL tag.  TAG must be less that 0x1f.  */
+void
+put_tlv_to_membuf (membuf_t *membuf, int class, int tag,
+                   int constructed, size_t length)
+{
+  unsigned char buf[20];
+  int buflen = 0;
+  int i;
+
+  if (tag < 0x1f)
+    {
+      *buf = (class << 6) | tag;
+      if (constructed)
+        *buf |= 0x20;
+      buflen++;
+    }
+  else
+    BUG ();
+
+  if (!tag && !class)
+    buf[buflen++] = 0; /* end tag */
+  else if (tag == TAG_NULL && !class)
+    buf[buflen++] = 0; /* NULL tag */
+  else if (!length)
+    buf[buflen++] = 0x80; /* indefinite length */
+  else if (length < 128)
+    buf[buflen++] = length;
+  else
+    {
+      /* If we know the sizeof a size_t we could support larger
+       * objects - however this is pretty ridiculous */
+      i = (length <= 0xff ? 1:
+           length <= 0xffff ? 2:
+           length <= 0xffffff ? 3: 4);
+
+      buf[buflen++] = (0x80 | i);
+      if (i > 3)
+        buf[buflen++] = length >> 24;
+      if (i > 2)
+        buf[buflen++] = length >> 16;
+      if (i > 1)
+        buf[buflen++] = length >> 8;
+      buf[buflen++] = length;
+    }
+
+  put_membuf (membuf, buf, buflen);
+}
+
+
+/* Return the length of the to be constructed TLV.  CONSTRUCTED is a
+ * flag telling whether the value is constructed.  LENGTH gives the
+ * length of the value, if it is 0 undefinite length is assumed.
+ * LENGTH is ignored for the NULL tag.  TAG must be less that 0x1f.  */
+size_t
+get_tlv_length (int class, int tag, int constructed, size_t length)
+{
+  size_t buflen = 0;
+  int i;
+
+  (void)constructed;  /* Not used, but passed for uniformity of such calls.  */
+
+  /* coverity[identical_branches] */
+  if (tag < 0x1f)
+    {
+      buflen++;
+    }
+  else
+    {
+      buflen++; /* assume one and let the actual write function bail out */
+    }
+
+  if (!tag && !class)
+    buflen++; /* end tag */
+  else if (tag == TAG_NULL && !class)
+    buflen++; /* NULL tag */
+  else if (!length)
+    buflen++; /* indefinite length */
+  else if (length < 128)
+    buflen++;
+  else
+    {
+      i = (length <= 0xff ? 1:
+           length <= 0xffff ? 2:
+           length <= 0xffffff ? 3: 4);
+
+      buflen++;
+      if (i > 3)
+        buflen++;
+      if (i > 2)
+        buflen++;
+      if (i > 1)
+        buflen++;
+      buflen++;
+    }
+
+  return buflen + length;
+}
diff --git a/common/tlv.c b/common/tlv.c
index 7fb7bde..abef83a 100644
--- a/common/tlv.c
+++ b/common/tlv.c
@@ -32,21 +32,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
-
-#if GNUPG_MAJOR_VERSION == 1
-#define GPG_ERR_EOF               (-1)
-#define GPG_ERR_BAD_BER           (1)  /*G10ERR_GENERAL*/
-#define GPG_ERR_INV_SEXP          (45) /*G10ERR_INV_ARG*/
-typedef int gpg_error_t;
-#define gpg_make_err(x,n) (n)
-#else
 #include <gpg-error.h>
-#endif
+
 
 #include "util.h"
 #include "tlv.h"
 
+
 static const unsigned char *
 do_find_tlv (const unsigned char *buffer, size_t length,
              int tag, size_t *nbytes, int nestlevel)
diff --git a/common/tlv.h b/common/tlv.h
index 0894e5d..51a0ef4 100644
--- a/common/tlv.h
+++ b/common/tlv.h
@@ -73,6 +73,11 @@ enum tlv_tag_type {
 };
 
 
+struct tlv_builder_s;
+typedef struct tlv_builder_s *tlv_builder_t;
+
+/*-- tlv.c --*/
+
 /* Locate a TLV encoded data object in BUFFER of LENGTH and return a
    pointer to value as well as its length in NBYTES.  Return NULL if
    it was not found or if the object does not fit into the buffer. */
@@ -88,7 +93,6 @@ const unsigned char *find_tlv_unchecked (const unsigned char *buffer,
                                          size_t length,
                                          int tag, size_t *nbytes);
 
-
 /* ASN.1 BER parser: Parse BUFFER of length SIZE and return the tag
    and the length part from the TLV triplet.  Update BUFFER and SIZE
    on success. */
@@ -114,5 +118,26 @@ gpg_error_t parse_sexp (unsigned char const **buf, size_t *buflen,
                         int *depth, unsigned char const **tok, size_t *toklen);
 
 
+/*-- tlv-builder.c --*/
+
+tlv_builder_t tlv_builder_new (int use_secure);
+void tlv_builder_add_ptr (tlv_builder_t tb, int class, int tag,
+                          void *value, size_t valuelen);
+void tlv_builder_add_val (tlv_builder_t tb, int class, int tag,
+                          const void *value, size_t valuelen);
+void tlv_builder_add_tag (tlv_builder_t tb, int class, int tag);
+void tlv_builder_add_end (tlv_builder_t tb);
+gpg_error_t tlv_builder_finalize (tlv_builder_t tb,
+                                  void **r_obj, size_t *r_objlen);
+
+/* Wite a TLV header to MEMBUF.  */
+void put_tlv_to_membuf (membuf_t *membuf, int class, int tag,
+                        int constructed, size_t length);
+
+/* Count the length of a to be constructed TLV.  */
+size_t get_tlv_length (int class, int tag, int constructed, size_t length);
+
+
+
 
 #endif /* SCD_TLV_H */
diff --git a/common/util.h b/common/util.h
index 5778b7d..82b3a34 100644
--- a/common/util.h
+++ b/common/util.h
@@ -314,6 +314,10 @@ void setup_libgcrypt_logging (void);
 /* Print an out of core message and die.  */
 void xoutofcore (void);
 
+/* Array allocation.  */
+void *gnupg_reallocarray (void *a, size_t oldnmemb, size_t nmemb, size_t size);
+void *xreallocarray (void *a, size_t oldnmemb, size_t nmemb, size_t size);
+
 /* Same as estream_asprintf but die on memory failure.  */
 char *xasprintf (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
 /* This is now an alias to estream_asprintf.  */
@@ -354,6 +358,15 @@ struct debug_flags_s
 int parse_debug_flag (const char *string, unsigned int *debugvar,
                       const struct debug_flags_s *flags);
 
+struct compatibility_flags_s
+{
+  unsigned int flag;
+  const char *name;
+  const char *desc;
+};
+int parse_compatibility_flags (const char *string, unsigned int *flagvar,
+                               const struct compatibility_flags_s *flags);
+
 
 /*-- Simple replacement functions. */
 
diff --git a/common/w32-reg.c b/common/w32-reg.c
index f36c664..cbaba56 100644
--- a/common/w32-reg.c
+++ b/common/w32-reg.c
@@ -54,17 +54,17 @@ get_root_key(const char *root)
 
   if (!root)
     root_key = HKEY_CURRENT_USER;
-  else if (!strcmp( root, "HKEY_CLASSES_ROOT" ) )
+  else if (!strcmp (root, "HKEY_CLASSES_ROOT") || !strcmp (root, "HKCR"))
     root_key = HKEY_CLASSES_ROOT;
-  else if (!strcmp( root, "HKEY_CURRENT_USER" ) )
+  else if (!strcmp (root, "HKEY_CURRENT_USER") || !strcmp (root, "HKCU"))
     root_key = HKEY_CURRENT_USER;
-  else if (!strcmp( root, "HKEY_LOCAL_MACHINE" ) )
+  else if (!strcmp (root, "HKEY_LOCAL_MACHINE") || !strcmp (root, "HKLM"))
     root_key = HKEY_LOCAL_MACHINE;
-  else if (!strcmp( root, "HKEY_USERS" ) )
+  else if (!strcmp (root, "HKEY_USERS") || !strcmp (root, "HKU"))
     root_key = HKEY_USERS;
-  else if (!strcmp( root, "HKEY_PERFORMANCE_DATA" ) )
+  else if (!strcmp (root, "HKEY_PERFORMANCE_DATA"))
     root_key = HKEY_PERFORMANCE_DATA;
-  else if (!strcmp( root, "HKEY_CURRENT_CONFIG" ) )
+  else if (!strcmp (root, "HKEY_CURRENT_CONFIG") || !strcmp (root, "HKCC"))
     root_key = HKEY_CURRENT_CONFIG;
   else
     return NULL;
@@ -160,8 +160,18 @@ read_w32_registry_string (const char *root, const char *dir, const char *name)
     }
 
   nbytes = 1;
-  if (RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes ) )
-    goto leave;
+  if (RegQueryValueEx (key_handle, name, 0, NULL, NULL, &nbytes))
+    {
+      if (root)
+        goto leave;
+      /* Try to fallback to HKLM also for a missing value.  */
+      RegCloseKey (key_handle);
+      if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle))
+        return NULL; /* Nope.  */
+      if (RegQueryValueEx (key_handle, name, 0, NULL, NULL, &nbytes))
+        goto leave;
+    }
+
   result = xtrymalloc ((n1=nbytes+1));
   if (!result)
     goto leave;
@@ -219,6 +229,19 @@ read_w32_registry_string (const char *root, const char *dir, const char *name)
           xfree (tmp);
         }
     }
+  else if (type == REG_DWORD && nbytes == sizeof (DWORD))
+    {
+      char *tmp;
+      DWORD dummy;
+
+      memcpy (&dummy, result, nbytes);
+      tmp = xtryasprintf ("%u", (unsigned int)dummy);
+      if (tmp)
+        {
+          xfree (result);
+          result = tmp;
+        }
+    }
 
  leave:
   RegCloseKey (key_handle);
@@ -240,14 +263,19 @@ read_w32_registry_string (const char *root, const char *dir, const char *name)
  *
  * Note that the first backslash and the first colon act as delimiters.
  *
- * Returns a malloced string or NULL if not found.
+ * Returns a malloced string or NULL if not found.  If R_HKLM_FALLBACK
+ * is not NULL, no class was given, and the result came from HKLM,
+ * true is stored there.
  */
 char *
-read_w32_reg_string (const char *key_arg)
+read_w32_reg_string (const char *key_arg, int *r_hklm_fallback)
 {
   char *key;
   char *p1, *p2;
-  char *result;
+  char *result, *result2;
+
+  if (r_hklm_fallback)
+    *r_hklm_fallback = 0;
 
   if (!key_arg)
     return NULL;
@@ -270,6 +298,15 @@ read_w32_reg_string (const char *key_arg)
     *p2++ = 0;
 
   result = read_w32_registry_string (*key? key : NULL, p1, p2);
+  if (result && !*key && r_hklm_fallback)
+    {
+      /* No key given - see whether the result came from HKCU or HKLM.  */
+      result2 = read_w32_registry_string ("HKCU", p1, p2);
+      if (result2)
+        xfree (result2);
+      else
+        *r_hklm_fallback = 1;
+    }
   xfree (key);
   return result;
 }
diff --git a/common/w32help.h b/common/w32help.h
index a79081f..54e9267 100644
--- a/common/w32help.h
+++ b/common/w32help.h
@@ -44,7 +44,7 @@ char **w32_parse_commandline (char *cmdline, int globing, int *r_argv,
 /*-- w32-reg.c --*/
 char *read_w32_registry_string (const char *root,
 				const char *dir, const char *name );
-char *read_w32_reg_string (const char *key);
+char *read_w32_reg_string (const char *key, int *r_hklm_fallback);
 
 /* Other stuff.  */
 #ifdef HAVE_W32CE_SYSTEM
diff --git a/common/w32info-rc.h.in b/common/w32info-rc.h.in
index 94f13b0..4c0e034 100644
--- a/common/w32info-rc.h.in
+++ b/common/w32info-rc.h.in
@@ -29,4 +29,4 @@ built on @BUILD_HOSTNAME@ at @BUILD_TIMESTAMP@\0"
 #define W32INFO_PRODUCTVERSION "@VERSION@\0"
 
 #define W32INFO_LEGALCOPYRIGHT "Copyright \xa9 \
-2021 g10 Code GmbH\0"
+2022 g10 Code GmbH\0"
diff --git a/config.h.in b/config.h.in
index b4187e5..240c7cb 100644
--- a/config.h.in
+++ b/config.h.in
@@ -903,20 +903,7 @@
 #define GNUPG_PRIVATE_KEYS_DIR  "private-keys-v1.d"
 #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
 
-/* GnuPG has always been a part of the GNU project and thus we have
- * shown the FSF as holder of the copyright.  We continue to do so for
- * the reason that without the FSF the free software used all over the
- * world would not have come into existence.  However, under Windows
- * we print a different copyright string with --version because the
- * copyright assignments of g10 Code and Werner Koch were terminated
- * many years ago, g10 Code is still the major contributor to the
- * code, and Windows is not an FSF endorsed platform.  Note that the
- * actual list of copyright holders can be found in the AUTHORS file.  */
-#ifdef HAVE_W32_SYSTEM
-#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2021 g10 Code GmbH"
-#else
-#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2021 Free Software Foundation, Inc."
-#endif
+#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2022 g10 Code GmbH"
 
 
 /* For some systems (DOS currently), we hardcode the path here.  For
diff --git a/configure b/configure
index c0544f9..3a55168 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.2.33.
+# Generated by GNU Autoconf 2.69 for gnupg 2.2.37.
 #
 # 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.2.33'
-PACKAGE_STRING='gnupg 2.2.33'
+PACKAGE_VERSION='2.2.37'
+PACKAGE_STRING='gnupg 2.2.37'
 PACKAGE_BUGREPORT='https://bugs.gnupg.org'
 PACKAGE_URL=''
 
@@ -728,6 +728,7 @@ GPG_ERROR_MT_LIBS
 GPG_ERROR_MT_CFLAGS
 GPG_ERROR_LIBS
 GPG_ERROR_CFLAGS
+GPGRT_CONFIG
 GPG_ERROR_CONFIG
 HAVE_ANDROID_SYSTEM_FALSE
 HAVE_ANDROID_SYSTEM_TRUE
@@ -938,6 +939,7 @@ with_libgpg_error_prefix
 with_gpg_error_prefix
 with_libgcrypt_prefix
 with_libassuan_prefix
+with_libksba_prefix
 with_ksba_prefix
 enable_sqlite
 with_npth_prefix
@@ -1535,7 +1537,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.2.33 to adapt to many kinds of systems.
+\`configure' configures gnupg 2.2.37 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1606,7 +1608,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnupg 2.2.33:";;
+     short | recursive ) echo "Configuration of gnupg 2.2.37:";;
    esac
   cat <<\_ACEOF
 
@@ -1712,7 +1714,8 @@ Optional Packages:
                           prefix where LIBGCRYPT is installed (optional)
   --with-libassuan-prefix=PFX
                           prefix where LIBASSUAN is installed (optional)
-  --with-ksba-prefix=PFX  prefix where KSBA is installed (optional)
+  --with-libksba-prefix=PFX
+                          prefix where KSBA is installed (optional)
   --with-npth-prefix=PFX  prefix where NPTH is installed (optional)
   --with-ntbtls-prefix=PFX
                           prefix where NTBTLS is installed (optional)
@@ -1822,7 +1825,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnupg configure 2.2.33
+gnupg configure 2.2.37
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2531,7 +2534,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.2.33, which was
+It was created by gnupg $as_me 2.2.37, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3430,7 +3433,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gnupg'
- VERSION='2.2.33'
+ VERSION='2.2.37'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8368,16 +8371,130 @@ fi
 
 
   min_gpg_error_version="$NEED_GPG_ERROR_VERSION"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG Error - version >= $min_gpg_error_version" >&5
-$as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6; }
   ok=no
-  if test "$GPG_ERROR_CONFIG" != "no" \
-     && test -f "$GPG_ERROR_CONFIG" ; then
+
+  # Extract the first word of "gpgrt-config", so it can be a program name with args.
+set dummy gpgrt-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GPGRT_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GPGRT_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GPGRT_CONFIG="$GPGRT_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$prefix/bin:$PATH"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GPGRT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GPGRT_CONFIG" && ac_cv_path_GPGRT_CONFIG="no"
+  ;;
+esac
+fi
+GPGRT_CONFIG=$ac_cv_path_GPGRT_CONFIG
+if test -n "$GPGRT_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGRT_CONFIG" >&5
+$as_echo "$GPGRT_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  if test "$GPGRT_CONFIG" != "no"; then
+    # Determine gpgrt_libdir
+    #
+    # Get the prefix of gpgrt-config assuming it's something like:
+    #   <PREFIX>/bin/gpgrt-config
+    gpgrt_prefix=${GPGRT_CONFIG%/*/*}
+    possible_libdir1=${gpgrt_prefix}/lib
+    # Determine by using system libdir-format with CC, it's like:
+    #   Normal style: /usr/lib
+    #   GNU cross style: /usr/<triplet>/lib
+    #   Debian style: /usr/lib/<multiarch-name>
+    #   Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64
+    # It is assumed that CC is specified to the one of host on cross build.
+    if libdir_candidates=$(${CC:-cc} -print-search-dirs | \
+          sed -n -e "/^libraries/{s/libraries: =//;s/:/\\
+/g;p;}"); then
+      # From the output of -print-search-dirs, select valid pkgconfig dirs.
+      libdir_candidates=$(for dir in $libdir_candidates; do
+        if p=$(cd $dir 2>/dev/null && pwd); then
+          test -d "$p/pkgconfig" && echo $p;
+        fi
+      done)
+
+      for possible_libdir0 in $libdir_candidates; do
+        # possible_libdir0:
+        #   Fallback candidate, the one of system-installed (by $CC)
+        #   (/usr/<triplet>/lib, /usr/lib/<multiarch-name> or /usr/lib32)
+        # possible_libdir1:
+        #   Another candidate, user-locally-installed
+        #   (<gpgrt_prefix>/lib)
+        # possible_libdir2
+        #   Most preferred
+        #   (<gpgrt_prefix>/<triplet>/lib,
+        #    <gpgrt_prefix>/lib/<multiarch-name> or <gpgrt_prefix>/lib32)
+        if test "${possible_libdir0##*/}" = "lib"; then
+          possible_prefix0=${possible_libdir0%/lib}
+          possible_prefix0_triplet=${possible_prefix0##*/}
+          if test -z "$possible_prefix0_triplet"; then
+            continue
+          fi
+          possible_libdir2=${gpgrt_prefix}/$possible_prefix0_triplet/lib
+        else
+          possible_prefix0=${possible_libdir0%%/lib*}
+          possible_libdir2=${gpgrt_prefix}${possible_libdir0#$possible_prefix0}
+        fi
+        if test -f ${possible_libdir2}/pkgconfig/gpg-error.pc; then
+          gpgrt_libdir=${possible_libdir2}
+        elif test -f ${possible_libdir1}/pkgconfig/gpg-error.pc; then
+          gpgrt_libdir=${possible_libdir1}
+        elif test -f ${possible_libdir0}/pkgconfig/gpg-error.pc; then
+          gpgrt_libdir=${possible_libdir0}
+        fi
+        if test -n "$gpgrt_libdir"; then break; fi
+      done
+    else
+      # When we cannot determine system libdir-format, use this:
+      gpgrt_libdir=${possible_libdir1}
+    fi
+  else
+    unset GPGRT_CONFIG
+  fi
+
+  if test -n "$gpgrt_libdir"; then
+    GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
+    if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
+      GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config with $gpgrt_libdir as gpg-error-config" >&5
+$as_echo "$as_me: Use gpgrt-config with $gpgrt_libdir as gpg-error-config" >&6;}
+      gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
+    else
+      unset GPGRT_CONFIG
+    fi
+  elif test "$GPG_ERROR_CONFIG" != "no"; then
+    gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
+  fi
+  if test "$GPG_ERROR_CONFIG" != "no"; then
     req_major=`echo $min_gpg_error_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\)/\1/'`
     req_minor=`echo $min_gpg_error_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\)/\2/'`
-    gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
     major=`echo $gpg_error_config_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
     minor=`echo $gpg_error_config_version | \
@@ -8392,31 +8509,44 @@ $as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6;
         fi
     fi
   fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG Error - version >= $min_gpg_error_version" >&5
+$as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6; }
   if test $ok = yes; then
-    GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
-    GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
-    GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
-    GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
+    GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
+    GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs`
+    if test -z "$GPGRT_CONFIG"; then
+      GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null`
+      GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null`
+    else
+      GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null`
+      GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS"
+      GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null`
+      GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS"
+    fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($gpg_error_config_version)" >&5
 $as_echo "yes ($gpg_error_config_version)" >&6; }
     have_gpg_error=yes
-    gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
+    if test -z "$GPGRT_CONFIG"; then
+      gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none`
+    else
+      gpg_error_config_host=`$GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none`
+    fi
     if test x"$gpg_error_config_host" != xnone ; then
       if test x"$gpg_error_config_host" != x"$host" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
 ***
-*** The config script $GPG_ERROR_CONFIG was
+*** The config script \"$GPG_ERROR_CONFIG\" was
 *** built for $gpg_error_config_host and thus may not match the
 *** used host $host.
-*** You may want to use the configure option --with-gpg-error-prefix
+*** You may want to use the configure option --with-libgpg-error-prefix
 *** to specify a matching config script or use \$SYSROOT.
 ***" >&5
 $as_echo "$as_me: WARNING:
 ***
-*** The config script $GPG_ERROR_CONFIG was
+*** The config script \"$GPG_ERROR_CONFIG\" was
 *** built for $gpg_error_config_host and thus may not match the
 *** used host $host.
-*** You may want to use the configure option --with-gpg-error-prefix
+*** You may want to use the configure option --with-libgpg-error-prefix
 *** to specify a matching config script or use \$SYSROOT.
 ***" >&2;}
         gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
@@ -8453,8 +8583,21 @@ fi
   if test x"${LIBGCRYPT_CONFIG}" = x ; then
      if test x"${libgcrypt_config_prefix}" != x ; then
         LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
-     else
-       case "${SYSROOT}" in
+     fi
+  fi
+
+  use_gpgrt_config=""
+  if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+    if $GPGRT_CONFIG libgcrypt --exists; then
+      LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as libgcrypt-config" >&5
+$as_echo "$as_me: Use gpgrt-config as libgcrypt-config" >&6;}
+      use_gpgrt_config=yes
+    fi
+  fi
+  if test -z "$use_gpgrt_config"; then
+    if test x"${LIBGCRYPT_CONFIG}" = x ; then
+      case "${SYSROOT}" in
          /*)
            if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
              LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
@@ -8466,11 +8609,9 @@ fi
            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5
 $as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;}
            ;;
-       esac
-     fi
-  fi
-
-  # Extract the first word of "libgcrypt-config", so it can be a program name with args.
+      esac
+    fi
+    # Extract the first word of "libgcrypt-config", so it can be a program name with args.
 set dummy libgcrypt-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -8511,6 +8652,8 @@ $as_echo "no" >&6; }
 fi
 
 
+  fi
+
   tmp="$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION"
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
      req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
@@ -8530,7 +8673,11 @@ $as_echo_n "checking for LIBGCRYPT - version >= $min_libgcrypt_version... " >&6;
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
     req_micro=`echo $min_libgcrypt_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
-    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+    if test -z "$use_gpgrt_config"; then
+      libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+    else
+      libgcrypt_config_version=`$LIBGCRYPT_CONFIG --modversion`
+    fi
     major=`echo $libgcrypt_config_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
     minor=`echo $libgcrypt_config_version | \
@@ -8564,7 +8711,11 @@ $as_echo "no" >&6; }
      # If we have a recent libgcrypt, we should also check that the
      # API is compatible
      if test "$req_libgcrypt_api" -gt 0 ; then
-        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+        if test -z "$use_gpgrt_config"; then
+           tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+	else
+           tmp=`$LIBGCRYPT_CONFIG --variable=api_version 2>/dev/null || echo 0`
+	fi
         if test "$tmp" -gt 0 ; then
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGCRYPT API version" >&5
 $as_echo_n "checking LIBGCRYPT API version... " >&6; }
@@ -8583,12 +8734,16 @@ $as_echo "does not match. want=$req_libgcrypt_api got=$tmp" >&6; }
     LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
     LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
     have_libgcrypt=yes
-    libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+    if test -z "$use_gpgrt_config"; then
+      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+    else
+      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none`
+    fi
     if test x"$libgcrypt_config_host" != xnone ; then
       if test x"$libgcrypt_config_host" != x"$host" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
 ***
-*** The config script $LIBGCRYPT_CONFIG was
+*** The config script \"$LIBGCRYPT_CONFIG\" was
 *** built for $libgcrypt_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-libgcrypt-prefix
@@ -8596,7 +8751,7 @@ $as_echo "does not match. want=$req_libgcrypt_api got=$tmp" >&6; }
 ***" >&5
 $as_echo "$as_me: WARNING:
 ***
-*** The config script $LIBGCRYPT_CONFIG was
+*** The config script \"$LIBGCRYPT_CONFIG\" was
 *** built for $libgcrypt_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-libgcrypt-prefix
@@ -8619,6 +8774,7 @@ $as_echo "$as_me: WARNING:
 # libassuan is used for IPC
 #
 
+
 # Check whether --with-libassuan-prefix was given.
 if test "${with_libassuan_prefix+set}" = set; then :
   withval=$with_libassuan_prefix; libassuan_config_prefix="$withval"
@@ -8627,12 +8783,22 @@ else
 fi
 
   if test x$libassuan_config_prefix != x ; then
-    libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
     if test x${LIBASSUAN_CONFIG+set} != xset ; then
       LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
     fi
   fi
-  # Extract the first word of "libassuan-config", so it can be a program name with args.
+
+  use_gpgrt_config=""
+  if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+    if $GPGRT_CONFIG libassuan --exists; then
+      LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as libassuan-config" >&5
+$as_echo "$as_me: Use gpgrt-config as libassuan-config" >&6;}
+      use_gpgrt_config=yes
+    fi
+  fi
+  if test -z "$use_gpgrt_config"; then
+    # Extract the first word of "libassuan-config", so it can be a program name with args.
 set dummy libassuan-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -8673,6 +8839,7 @@ $as_echo "no" >&6; }
 fi
 
 
+  fi
 
   tmp="$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION"
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
@@ -8683,48 +8850,49 @@ fi
     min_libassuan_version="$tmp"
   fi
 
-  if test "$LIBASSUAN_CONFIG" != "no" ; then
-    libassuan_version=`$LIBASSUAN_CONFIG --version`
-  fi
-  libassuan_version_major=`echo $libassuan_version | \
-               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
-  libassuan_version_minor=`echo $libassuan_version | \
-               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
-  libassuan_version_micro=`echo $libassuan_version | \
-               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBASSUAN - version >= $min_libassuan_version" >&5
 $as_echo_n "checking for LIBASSUAN - version >= $min_libassuan_version... " >&6; }
   ok=no
-  if test "$LIBASSUAN_CONFIG" != "no" ; then
-
+  if test "$LIBASSUAN_CONFIG" != "no"; then
     req_major=`echo $min_libassuan_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
     req_minor=`echo $min_libassuan_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
     req_micro=`echo $min_libassuan_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
-    if test "$libassuan_version_major" -gt "$req_major"; then
+
+    if test -z "$use_gpgrt_config"; then
+      libassuan_config_version=`$LIBASSUAN_CONFIG --version`
+    else
+      libassuan_config_version=`$LIBASSUAN_CONFIG --modversion`
+    fi
+    major=`echo $libassuan_config_version | \
+               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
+    minor=`echo $libassuan_config_version | \
+               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
+    micro=`echo $libassuan_config_version | \
+               sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+
+    if test "$major" -gt "$req_major"; then
         ok=yes
     else
-        if test "$libassuan_version_major" -eq "$req_major"; then
-            if test "$libassuan_version_minor" -gt "$req_minor"; then
+        if test "$major" -eq "$req_major"; then
+            if test "$minor" -gt "$req_minor"; then
                ok=yes
             else
-               if test "$libassuan_version_minor" -eq "$req_minor"; then
-                   if test "$libassuan_version_micro" -ge "$req_micro"; then
+               if test "$minor" -eq "$req_minor"; then
+                   if test "$micro" -ge "$req_micro"; then
                      ok=yes
                    fi
                fi
             fi
         fi
     fi
-
   fi
 
   if test $ok = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libassuan_version)" >&5
-$as_echo "yes ($libassuan_version)" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libassuan_config_version)" >&5
+$as_echo "yes ($libassuan_config_version)" >&6; }
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -8732,7 +8900,11 @@ $as_echo "no" >&6; }
 
   if test $ok = yes; then
     if test "$req_libassuan_api" -gt 0 ; then
-      tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
+      if test -z "$use_gpgrt_config"; then
+        tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
+      else
+        tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
+      fi
       if test "$tmp" -gt 0 ; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBASSUAN API version" >&5
 $as_echo_n "checking LIBASSUAN API version... " >&6; }
@@ -8748,10 +8920,39 @@ $as_echo "does not match.  want=$req_libassuan_api got=$tmp." >&6; }
     fi
   fi
 
+  if test $ok = yes; then
+    if test x"$host" != x ; then
+      if test -z "$use_gpgrt_config"; then
+        libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
+      else
+        libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
+      fi
+      if test x"$libassuan_config_host" != xnone ; then
+        if test x"$libassuan_config_host" != x"$host" ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+***
+*** The config script \"$LIBASSUAN_CONFIG\" was
+*** built for $libassuan_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libassuan-prefix
+*** to specify a matching config script.
+***" >&5
+$as_echo "$as_me: WARNING:
+***
+*** The config script \"$LIBASSUAN_CONFIG\" was
+*** built for $libassuan_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libassuan-prefix
+*** to specify a matching config script.
+***" >&2;}
+        fi
+      fi
+    fi
+  fi
 
   if test $ok = yes; then
-    LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
-    LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
+    LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
+    LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
     have_libassuan=yes
   else
     LIBASSUAN_CFLAGS=""
@@ -8776,6 +8977,15 @@ fi
 #
 
 
+# Check whether --with-libksba-prefix was given.
+if test "${with_libksba_prefix+set}" = set; then :
+  withval=$with_libksba_prefix; ksba_config_prefix="$withval"
+else
+  ksba_config_prefix=""
+fi
+
+
+
 # Check whether --with-ksba-prefix was given.
 if test "${with_ksba_prefix+set}" = set; then :
   withval=$with_ksba_prefix; ksba_config_prefix="$withval"
@@ -8783,14 +8993,24 @@ else
   ksba_config_prefix=""
 fi
 
+
   if test x$ksba_config_prefix != x ; then
-     ksba_config_args="$ksba_config_args --prefix=$ksba_config_prefix"
-     if test x${KSBA_CONFIG+set} != xset ; then
-        KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config
-     fi
+    if test x${KSBA_CONFIG+set} != xset ; then
+      KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config
+    fi
   fi
 
-  # Extract the first word of "ksba-config", so it can be a program name with args.
+  use_gpgrt_config=""
+  if test x"$KSBA_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+    if $GPGRT_CONFIG ksba --exists; then
+      KSBA_CONFIG="$GPGRT_CONFIG ksba"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as ksba-config" >&5
+$as_echo "$as_me: Use gpgrt-config as ksba-config" >&6;}
+      use_gpgrt_config=yes
+    fi
+  fi
+  if test -z "$use_gpgrt_config"; then
+    # Extract the first word of "ksba-config", so it can be a program name with args.
 set dummy ksba-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -8831,6 +9051,8 @@ $as_echo "no" >&6; }
 fi
 
 
+  fi
+
   tmp="$NEED_KSBA_API:$NEED_KSBA_VERSION"
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
      req_ksba_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
@@ -8850,7 +9072,11 @@ $as_echo_n "checking for KSBA - version >= $min_ksba_version... " >&6; }
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
     req_micro=`echo $min_ksba_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
-    ksba_config_version=`$KSBA_CONFIG $ksba_config_args --version`
+    if test -z "$use_gpgrt_config"; then
+      ksba_config_version=`$KSBA_CONFIG --version`
+    else
+      ksba_config_version=`$KSBA_CONFIG --modversion`
+    fi
     major=`echo $ksba_config_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
     minor=`echo $ksba_config_version | \
@@ -8884,7 +9110,11 @@ $as_echo "no" >&6; }
      # Even if we have a recent libksba, we should check that the
      # API is compatible.
      if test "$req_ksba_api" -gt 0 ; then
-        tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0`
+        if test -z "$use_gpgrt_config"; then
+          tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0`
+	else
+          tmp=`$KSBA_CONFIG --variable=api_version 2>/dev/null || echo 0`
+	fi
         if test "$tmp" -gt 0 ; then
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking KSBA API version" >&5
 $as_echo_n "checking KSBA API version... " >&6; }
@@ -8900,15 +9130,19 @@ $as_echo "does not match.  want=$req_ksba_api got=$tmp." >&6; }
      fi
   fi
   if test $ok = yes; then
-    KSBA_CFLAGS=`$KSBA_CONFIG $ksba_config_args --cflags`
-    KSBA_LIBS=`$KSBA_CONFIG $ksba_config_args --libs`
+    KSBA_CFLAGS=`$KSBA_CONFIG --cflags`
+    KSBA_LIBS=`$KSBA_CONFIG --libs`
     have_ksba=yes
-    libksba_config_host=`$LIBKSBA_CONFIG $ksba_config_args --host 2>/dev/null || echo none`
+    if test -z "$use_gpgrt_config"; then
+      libksba_config_host=`$KSBA_CONFIG --host 2>/dev/null || echo none`
+    else
+      libksba_config_host=`$KSBA_CONFIG --variable=host 2>/dev/null || echo none`
+    fi
     if test x"$libksba_config_host" != xnone ; then
       if test x"$libksba_config_host" != x"$host" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
 ***
-*** The config script $LIBKSBA_CONFIG was
+*** The config script \"$KSBA_CONFIG\" was
 *** built for $libksba_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-libksba-prefix
@@ -8916,7 +9150,7 @@ $as_echo "does not match.  want=$req_ksba_api got=$tmp." >&6; }
 ***" >&5
 $as_echo "$as_me: WARNING:
 ***
-*** The config script $LIBKSBA_CONFIG was
+*** The config script \"$KSBA_CONFIG\" was
 *** built for $libksba_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-libksba-prefix
@@ -9455,7 +9689,18 @@ fi
   if test "x$npth_config_prefix" != x ; then
       NPTH_CONFIG="$npth_config_prefix/bin/npth-config"
   fi
-  # Extract the first word of "npth-config", so it can be a program name with args.
+
+  use_gpgrt_config=""
+  if test x"$NPTH_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+    if $GPGRT_CONFIG npth --exists; then
+      NPTH_CONFIG="$GPGRT_CONFIG npth"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as npth-config" >&5
+$as_echo "$as_me: Use gpgrt-config as npth-config" >&6;}
+      use_gpgrt_config=yes
+    fi
+  fi
+  if test -z "$use_gpgrt_config"; then
+    # Extract the first word of "npth-config", so it can be a program name with args.
 set dummy npth-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -9496,9 +9741,14 @@ $as_echo "no" >&6; }
 fi
 
 
+  fi
 
   if test "$NPTH_CONFIG" != "no" ; then
-    npth_version=`$NPTH_CONFIG --version`
+    if test -z "$use_gpgrt_config"; then
+      npth_version=`$NPTH_CONFIG --version`
+    else
+      npth_version=`$NPTH_CONFIG --modversion`
+    fi
   fi
   npth_version_major=`echo $npth_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
@@ -9544,34 +9794,42 @@ $as_echo "yes ($npth_version)" >&6; }
 $as_echo "no" >&6; }
   fi
   if test $ok = yes; then
-     # If we have a recent NPTH, we should also check that the
-     # API is compatible.
-     if test "$req_npth_api" -gt 0 ; then
+    # If we have a recent NPTH, we should also check that the
+    # API is compatible.
+    if test "$req_npth_api" -gt 0 ; then
+      if test -z "$use_gpgrt_config"; then
         tmp=`$NPTH_CONFIG --api-version 2>/dev/null || echo 0`
-        if test "$tmp" -gt 0 ; then
-           { $as_echo "$as_me:${as_lineno-$LINENO}: checking NPTH API version" >&5
+      else
+        tmp=`$NPTH_CONFIG --variable=api_version 2>/dev/null || echo 0`
+      fi
+      if test "$tmp" -gt 0 ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking NPTH API version" >&5
 $as_echo_n "checking NPTH API version... " >&6; }
-           if test "$req_npth_api" -eq "$tmp" ; then
-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
+        if test "$req_npth_api" -eq "$tmp" ; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
 $as_echo "okay" >&6; }
-           else
-             ok=no
-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_npth_api got=$tmp" >&5
+        else
+          ok=no
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_npth_api got=$tmp" >&5
 $as_echo "does not match. want=$req_npth_api got=$tmp" >&6; }
-           fi
         fi
-     fi
+      fi
+    fi
   fi
   if test $ok = yes; then
     NPTH_CFLAGS=`$NPTH_CONFIG --cflags`
     NPTH_LIBS=`$NPTH_CONFIG --libs`
     have_npth=yes
-    npth_config_host=`$NPTH_CONFIG --host 2>/dev/null || echo none`
+    if test -z "$use_gpgrt_config"; then
+      npth_config_host=`$NPTH_CONFIG --host 2>/dev/null || echo none`
+    else
+      npth_config_host=`$NPTH_CONFIG --variable=host 2>/dev/null || echo none`
+    fi
     if test x"$npth_config_host" != xnone ; then
       if test x"$npth_config_host" != x"$host" ; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
 ***
-*** The config script $NPTH_CONFIG was
+*** The config script \"$NPTH_CONFIG\" was
 *** built for $npth_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-npth-prefix
@@ -9579,7 +9837,7 @@ $as_echo "does not match. want=$req_npth_api got=$tmp" >&6; }
 ***" >&5
 $as_echo "$as_me: WARNING:
 ***
-*** The config script $NPTH_CONFIG was
+*** The config script \"$NPTH_CONFIG\" was
 *** built for $npth_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-npth-prefix
@@ -9653,24 +9911,35 @@ fi
   if test x"${NTBTLS_CONFIG}" = x ; then
      if test x"${ntbtls_config_prefix}" != x ; then
         NTBTLS_CONFIG="${ntbtls_config_prefix}/bin/ntbtls-config"
-     else
-       case "${SYSROOT}" in
-         /*)
-           if test -x "${SYSROOT}/bin/ntbtls-config" ; then
-             NTBTLS_CONFIG="${SYSROOT}/bin/ntbtls-config"
-           fi
-           ;;
-         '')
-           ;;
-          *)
-           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5
-$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;}
-           ;;
-       esac
      fi
   fi
 
-  # Extract the first word of "ntbtls-config", so it can be a program name with args.
+  use_gpgrt_config=""
+  if test x"${NTBTLS_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+    if $GPGRT_CONFIG ntbtls --exists; then
+      NTBTLS_CONFIG="$GPGRT_CONFIG ntbtls"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: Use gpgrt-config as ntbtls-config" >&5
+$as_echo "$as_me: Use gpgrt-config as ntbtls-config" >&6;}
+      use_gpgrt_config=yes
+    fi
+  fi
+  if test -z "$use_gpgrt_config"; then
+    if test x"${NTBTLS_CONFIG}" = x ; then
+      case "${SYSROOT}" in
+        /*)
+          if test -x "${SYSROOT}/bin/ntbtls-config" ; then
+            NTBTLS_CONFIG="${SYSROOT}/bin/ntbtls-config"
+          fi
+          ;;
+        '')
+          ;;
+         *)
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5
+$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;}
+          ;;
+      esac
+    fi
+    # Extract the first word of "ntbtls-config", so it can be a program name with args.
 set dummy ntbtls-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -9711,6 +9980,8 @@ $as_echo "no" >&6; }
 fi
 
 
+  fi
+
   tmp="$NEED_NTBTLS_API:$NEED_NTBTLS_VERSION"
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
      req_ntbtls_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
@@ -9730,7 +10001,11 @@ $as_echo_n "checking for NTBTLS - version >= $min_ntbtls_version... " >&6; }
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
     req_micro=`echo $min_ntbtls_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
-    ntbtls_config_version=`$NTBTLS_CONFIG --version`
+    if test -z "$use_gpgrt_config"; then
+      ntbtls_config_version=`$NTBTLS_CONFIG --version`
+    else
+      ntbtls_config_version=`$NTBTLS_CONFIG --modversion`
+    fi
     major=`echo $ntbtls_config_version | \
                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
     minor=`echo $ntbtls_config_version | \
@@ -9764,7 +10039,11 @@ $as_echo "no" >&6; }
      # If we have a recent ntbtls, we should also check that the
      # API is compatible
      if test "$req_ntbtls_api" -gt 0 ; then
-        tmp=`$NTBTLS_CONFIG --api-version 2>/dev/null || echo 0`
+        if test -z "$use_gpgrt_config"; then
+          tmp=`$NTBTLS_CONFIG --api-version 2>/dev/null || echo 0`
+        else
+          tmp=`$NTBTLS_CONFIG --variable=api_version 2>/dev/null || echo 0`
+	fi
         if test "$tmp" -gt 0 ; then
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking NTBTLS API version" >&5
 $as_echo_n "checking NTBTLS API version... " >&6; }
@@ -9783,12 +10062,16 @@ $as_echo "does not match. want=$req_ntbtls_api got=$tmp" >&6; }
     NTBTLS_CFLAGS=`$NTBTLS_CONFIG --cflags`
     NTBTLS_LIBS=`$NTBTLS_CONFIG --libs`
     have_ntbtls=yes
-    ntbtls_config_host=`$NTBTLS_CONFIG --host 2>/dev/null || echo none`
+    if test -z "$use_gpgrt_config"; then
+      ntbtls_config_host=`$NTBTLS_CONFIG --host 2>/dev/null || echo none`
+    else
+      ntbtls_config_host=`$NTBTLS_CONFIG --variable=host 2>/dev/null || echo none`
+    fi
     if test x"$ntbtls_config_host" != xnone ; then
       if test x"$ntbtls_config_host" != x"$host" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
 ***
-*** The config script $NTBTLS_CONFIG was
+*** The config script \"$NTBTLS_CONFIG\" was
 *** built for $ntbtls_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-ntbtls-prefix
@@ -9796,7 +10079,7 @@ $as_echo "does not match. want=$req_ntbtls_api got=$tmp" >&6; }
 ***" >&5
 $as_echo "$as_me: WARNING:
 ***
-*** The config script $NTBTLS_CONFIG was
+*** The config script \"$NTBTLS_CONFIG\" was
 *** built for $ntbtls_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-ntbtls-prefix
@@ -16037,7 +16320,7 @@ fi
 #
 # Provide information about the build.
 #
-BUILD_REVISION="457f6ac1e"
+BUILD_REVISION="8e60f8857"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16046,7 +16329,7 @@ _ACEOF
 
 
 BUILD_VERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./'`
-BUILD_VERSION="${BUILD_VERSION}17791"
+BUILD_VERSION="${BUILD_VERSION}36448"
 BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,`
 
 
@@ -16906,7 +17189,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.2.33, which was
+This file was extended by gnupg $as_me 2.2.37, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16972,7 +17255,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.2.33
+gnupg config.status 2.2.37
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17992,7 +18275,7 @@ fi
 echo "
         GnuPG v${VERSION} has been configured as follows:
 
-        Revision:  457f6ac1e  (17791)
+        Revision:  8e60f8857  (36448)
         Platform:  $PRINTABLE_OS_NAME ($host)
 
         OpenPGP:   $build_gpg
diff --git a/configure.ac b/configure.ac
index 5d24ca2..417ea18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # configure.ac - for GnuPG 2.2
 # Copyright (C) 1998-2019 Free Software Foundation, Inc.
 # Copyright (C) 1998-2019 Werner Koch
-# Copyright (C) 2003-2021 g10 Code GmbH
+# Copyright (C) 2003-2022 g10 Code GmbH
 #
 # This file is part of GnuPG.
 #
@@ -29,7 +29,7 @@ min_automake_version="1.14"
 m4_define([mym4_package],[gnupg])
 m4_define([mym4_major], [2])
 m4_define([mym4_minor], [2])
-m4_define([mym4_micro], [33])
+m4_define([mym4_micro], [37])
 
 # 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
@@ -509,20 +509,7 @@ AH_BOTTOM([
 #define GNUPG_PRIVATE_KEYS_DIR  "private-keys-v1.d"
 #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
 
-/* GnuPG has always been a part of the GNU project and thus we have
- * shown the FSF as holder of the copyright.  We continue to do so for
- * the reason that without the FSF the free software used all over the
- * world would not have come into existence.  However, under Windows
- * we print a different copyright string with --version because the
- * copyright assignments of g10 Code and Werner Koch were terminated
- * many years ago, g10 Code is still the major contributor to the
- * code, and Windows is not an FSF endorsed platform.  Note that the
- * actual list of copyright holders can be found in the AUTHORS file.  */
-#ifdef HAVE_W32_SYSTEM
-#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2021 g10 Code GmbH"
-#else
-#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2021 Free Software Foundation, Inc."
-#endif
+#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2022 g10 Code GmbH"
 
 
 /* For some systems (DOS currently), we hardcode the path here.  For
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index 0443d66..f55bb35 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -96,9 +96,9 @@ endif
 
 dirmngr_LDADD = $(libcommonpth) \
         $(DNSLIBS) $(LIBASSUAN_LIBS) \
-	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \
-	$(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \
-        $(dirmngr_robj)
+	$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
+        $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
+        $(NETLIBS) $(dirmngr_robj)
 if USE_LDAP
 dirmngr_LDADD += $(ldaplibs)
 endif
@@ -124,10 +124,10 @@ t_common_src = t-support.h t-support.c
 if USE_LIBDNS
 t_common_src += dns.c dns.h
 endif
-t_common_ldadd = $(libcommon) $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
-                 $(GPG_ERROR_LIBS) $(NETLIBS) \
-                 $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
-                 $(DNSLIBS) $(LIBINTL) $(LIBICONV)
+t_common_ldadd = $(libcommon) $(LIBASSUAN_LIBS) \
+                 $(NTBTLS_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+                 $(LIBGNUTLS_LIBS) \
+                 $(NETLIBS) $(DNSLIBS) $(LIBINTL) $(LIBICONV)
 
 module_tests = t-http-basic
 
@@ -166,27 +166,30 @@ t_http_basic_CFLAGS  = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
 	         $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) $(LIBGNUTLS_CFLAGS) \
                  $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS)
 t_http_basic_LDADD   = $(t_common_ldadd) \
-	         $(NTBTLS_LIBS) $(KSBA_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS)
+	               $(NTBTLS_LIBS) $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
+                       $(GPG_ERROR_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 ldap-misc.c \
         $(ldap_url) $(t_common_src)
 t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
-			  $(LIBGCRYPT_CFLAGS) \
+			  $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) \
                           $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS)
-t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS)
+t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(KSBA_LIBS) $(DNSLIBS)
 
 t_ldap_misc_SOURCES = t-ldap-misc.c ldap-misc.c ldap-misc.h $(ldap_url)
-t_ldap_misc_CFLAGS = -DWITHOUT_NPTH=1 $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
+t_ldap_misc_CFLAGS = -DWITHOUT_NPTH=1 $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS) \
+                     $(NTBTLS_CFLAGS)
 t_ldap_misc_LDFLAGS =
-t_ldap_misc_LDADD = $(libcommon) \
-		     $(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
-		     $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
+t_ldap_misc_LDADD = $(libcommon) $(NTBTLS_LIBS) $(LIBGCRYPT_LIBS) \
+                    $(LDAPLIBS) $(LBER_LIBS) $(LIBINTL) \
+                    $(KSBA_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(NETLIBS)
 
 
 t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
-		     $(LIBGCRYPT_CFLAGS) \
+		     $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) \
 	             $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
 t_dns_stuff_SOURCES = $(t_common_src) t-dns-stuff.c dns-stuff.c
 t_dns_stuff_LDADD   = $(t_common_ldadd) $(DNSLIBS)
diff --git a/dirmngr/Makefile.in b/dirmngr/Makefile.in
index 51aec93..4d35b8b 100644
--- a/dirmngr/Makefile.in
+++ b/dirmngr/Makefile.in
@@ -226,7 +226,8 @@ dirmngr_DEPENDENCIES = $(libcommonpth) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_3)
 dirmngr_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(dirmngr_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am_dirmngr_client_OBJECTS = dirmngr-client.$(OBJEXT)
@@ -292,6 +293,7 @@ am_t_http_basic_OBJECTS = $(am__objects_10) \
 t_http_basic_OBJECTS = $(am_t_http_basic_OBJECTS)
 t_http_basic_DEPENDENCIES = $(am__DEPENDENCIES_4) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 t_http_basic_LINK = $(CCLD) $(t_http_basic_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -304,6 +306,7 @@ 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) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 t_ldap_misc_LINK = $(CCLD) $(t_ldap_misc_CFLAGS) $(CFLAGS) \
 	$(t_ldap_misc_LDFLAGS) $(LDFLAGS) -o $@
@@ -326,7 +329,8 @@ am_t_ldap_parse_uri_OBJECTS =  \
 	$(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)
+	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 t_ldap_parse_uri_LINK = $(CCLD) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
@@ -536,6 +540,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
@@ -725,9 +730,9 @@ dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c \
 @HAVE_W32_SYSTEM_FALSE@dirmngr_robjs = 
 @HAVE_W32_SYSTEM_TRUE@dirmngr_robjs = $(resource_objs) dirmngr-w32info.o
 dirmngr_LDADD = $(libcommonpth) $(DNSLIBS) $(LIBASSUAN_LIBS) \
-	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) \
-	$(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \
-	$(dirmngr_robj) $(am__append_10)
+	$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
+	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
+	$(NETLIBS) $(dirmngr_robj) $(am__append_10)
 dirmngr_LDFLAGS = $(extra_bin_ldflags)
 @USE_LDAP_TRUE@dirmngr_ldap_SOURCES = dirmngr_ldap.c ldap-misc.c ldap-misc.h $(ldap_url)
 @USE_LDAP_TRUE@dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
@@ -743,10 +748,10 @@ dirmngr_client_LDADD = $(libcommon) \
 
 dirmngr_client_LDFLAGS = $(extra_bin_ldflags)
 t_common_src = t-support.h t-support.c $(am__append_11)
-t_common_ldadd = $(libcommon) $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
-                 $(GPG_ERROR_LIBS) $(NETLIBS) \
-                 $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
-                 $(DNSLIBS) $(LIBINTL) $(LIBICONV)
+t_common_ldadd = $(libcommon) $(LIBASSUAN_LIBS) \
+                 $(NTBTLS_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
+                 $(LIBGNUTLS_LIBS) \
+                 $(NETLIBS) $(DNSLIBS) $(LIBINTL) $(LIBICONV)
 
 module_tests = t-http-basic $(am__append_12)
 @MAINTAINER_MODE_FALSE@module_net_tests = 
@@ -777,7 +782,9 @@ t_http_basic_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
                  $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS)
 
 t_http_basic_LDADD = $(t_common_ldadd) \
-	         $(NTBTLS_LIBS) $(KSBA_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS)
+	               $(NTBTLS_LIBS) $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
+                       $(GPG_ERROR_LIBS) \
+                       $(LIBGNUTLS_LIBS) $(DNSLIBS)
 
 t_ldap_parse_uri_SOURCES = \
 	t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \
@@ -785,19 +792,21 @@ t_ldap_parse_uri_SOURCES = \
         $(ldap_url) $(t_common_src)
 
 t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
-			  $(LIBGCRYPT_CFLAGS) \
+			  $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) \
                           $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS)
 
-t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS)
+t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(KSBA_LIBS) $(DNSLIBS)
 t_ldap_misc_SOURCES = t-ldap-misc.c ldap-misc.c ldap-misc.h $(ldap_url)
-t_ldap_misc_CFLAGS = -DWITHOUT_NPTH=1 $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
+t_ldap_misc_CFLAGS = -DWITHOUT_NPTH=1 $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS) \
+                     $(NTBTLS_CFLAGS)
+
 t_ldap_misc_LDFLAGS = 
-t_ldap_misc_LDADD = $(libcommon) \
-		     $(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
-		     $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
+t_ldap_misc_LDADD = $(libcommon) $(NTBTLS_LIBS) $(LIBGCRYPT_LIBS) \
+                    $(LDAPLIBS) $(LBER_LIBS) $(LIBINTL) \
+                    $(KSBA_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(NETLIBS)
 
 t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
-		     $(LIBGCRYPT_CFLAGS) \
+		     $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) \
 	             $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
 
 t_dns_stuff_SOURCES = $(t_common_src) t-dns-stuff.c dns-stuff.c
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 9e28005..fa10c28 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1,6 +1,6 @@
 /* dirmngr.c - Keyserver and X.509 LDAP access
  * Copyright (C) 2002 Klarälvdalens Datakonsult AB
- * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2010, 2011, 2020 g10 Code GmbH
+ * Copyright (C) 2003-2004, 2006-2007, 2008, 2010-2011, 2020-2021 g10 Code GmbH
  * Copyright (C) 2014 Werner Koch
  *
  * This file is part of GnuPG.
@@ -163,6 +163,10 @@ enum cmd_and_opt_values {
 
 static ARGPARSE_OPTS opts[] = {
 
+  ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
+  ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
+  ARGPARSE_c (aGPGConfVersions, "gpgconf-versions", "@"),
+
   ARGPARSE_group (300, N_("@Commands:\n ")),
 
   ARGPARSE_c (aServer,   "server",  N_("run in server mode (foreground)") ),
@@ -171,48 +175,96 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_c (aSupervised,  "supervised", N_("run in supervised mode")),
 #endif
   ARGPARSE_c (aListCRLs, "list-crls", N_("list the contents of the CRL cache")),
-  ARGPARSE_c (aLoadCRL,  "load-crl",  N_("|FILE|load CRL from FILE into cache")),
+  ARGPARSE_c (aLoadCRL,  "load-crl", N_("|FILE|load CRL from FILE into cache")),
   ARGPARSE_c (aFetchCRL, "fetch-crl", N_("|URL|fetch a CRL from URL")),
   ARGPARSE_c (aShutdown, "shutdown",  N_("shutdown the dirmngr")),
   ARGPARSE_c (aFlush,    "flush",     N_("flush the cache")),
-  ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
-  ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
-  ARGPARSE_c (aGPGConfVersions, "gpgconf-versions", "@"),
 
-  ARGPARSE_group (301, N_("@\nOptions:\n ")),
 
-  ARGPARSE_s_n (oVerbose,  "verbose",   N_("verbose")),
-  ARGPARSE_s_n (oQuiet,    "quiet",     N_("be somewhat more quiet")),
+  ARGPARSE_header (NULL, N_("Options used for startup")),
+
+  ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")),
   ARGPARSE_s_n (oSh,       "sh",        N_("sh-style command output")),
   ARGPARSE_s_n (oCsh,      "csh",       N_("csh-style command output")),
-  ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
+  ARGPARSE_s_n (oStealSocket, "steal-socket", "@"),
+  ARGPARSE_s_s (oHomedir, "homedir", "@"),
+  ARGPARSE_conffile (oOptions,  "options", N_("|FILE|read options from FILE")),
+  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
+
+
+  ARGPARSE_header ("Monitor", N_("Options controlling the diagnostic output")),
+
+  ARGPARSE_s_n (oVerbose,  "verbose",   N_("verbose")),
+  ARGPARSE_s_n (oQuiet,    "quiet",     N_("be somewhat more quiet")),
+  ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
   ARGPARSE_s_s (oDebugLevel, "debug-level",
                 N_("|LEVEL|set the debugging level to LEVEL")),
-  ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")),
-  ARGPARSE_s_n (oStealSocket, "steal-socket", "@"),
+  ARGPARSE_s_s (oDebug,    "debug", "@"),
+  ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
+  ARGPARSE_s_i (oGnutlsDebug, "gnutls-debug", "@"),
+  ARGPARSE_s_i (oGnutlsDebug, "tls-debug", "@"),
+  ARGPARSE_s_i (oDebugWait, "debug-wait", "@"),
   ARGPARSE_s_s (oLogFile,  "log-file",
                 N_("|FILE|write server mode logs to FILE")),
-  ARGPARSE_s_n (oBatch,    "batch",       N_("run without asking a user")),
-  ARGPARSE_s_n (oForce,    "force",       N_("force loading of outdated CRLs")),
-  ARGPARSE_s_n (oAllowOCSP, "allow-ocsp", N_("allow sending OCSP requests")),
+
+
+  ARGPARSE_header ("Configuration",
+                   N_("Options controlling the configuration")),
+
   ARGPARSE_s_n (oAllowVersionCheck, "allow-version-check",
                 N_("allow online software version check")),
+  ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
+  ARGPARSE_s_i (oMaxReplies, "max-replies",
+                N_("|N|do not return more than N items in one query")),
+  ARGPARSE_s_u (oFakedSystemTime, "faked-system-time", "@"), /*(epoch time)*/
+  ARGPARSE_s_n (oDisableCheckOwnSocket, "disable-check-own-socket", "@"),
+  ARGPARSE_s_s (oIgnoreCert,"ignore-cert", "@"),
+  ARGPARSE_s_s (oIgnoreCertExtension,"ignore-cert-extension", "@"),
+
+
+  ARGPARSE_header ("Network", N_("Network related options")),
+
+  ARGPARSE_s_n (oUseTor, "use-tor", N_("route all network traffic via Tor")),
+  ARGPARSE_s_n (oNoUseTor, "no-use-tor", "@"),
+  ARGPARSE_s_n (oDisableIPv4, "disable-ipv4", "@"),
+  ARGPARSE_s_n (oDisableIPv6, "disable-ipv6", "@"),
+  ARGPARSE_s_n (oStandardResolver, "standard-resolver", "@"),
+  ARGPARSE_s_n (oRecursiveResolver, "recursive-resolver", "@"),
+  ARGPARSE_s_i (oResolverTimeout, "resolver-timeout", "@"),
+  ARGPARSE_s_s (oNameServer, "nameserver", "@"),
+  ARGPARSE_s_i (oConnectTimeout, "connect-timeout", "@"),
+  ARGPARSE_s_i (oConnectQuickTimeout, "connect-quick-timeout", "@"),
+
+
+  ARGPARSE_header ("Keyserver", N_("Configuration for Keyservers")),
+
+  ARGPARSE_s_s (oKeyServer, "keyserver",
+                N_("|URL|use keyserver at URL")),
+  ARGPARSE_s_s (oHkpCaCert, "hkp-cacert",
+                N_("|FILE|use the CA certificates in FILE for HKP over TLS")),
+
+
+  ARGPARSE_header ("HTTP", N_("Configuration for HTTP servers")),
+
   ARGPARSE_s_n (oDisableHTTP, "disable-http", N_("inhibit the use of HTTP")),
-  ARGPARSE_s_n (oDisableLDAP, "disable-ldap", N_("inhibit the use of LDAP")),
   ARGPARSE_s_n (oIgnoreHTTPDP,"ignore-http-dp",
                 N_("ignore HTTP CRL distribution points")),
-  ARGPARSE_s_n (oIgnoreLDAPDP,"ignore-ldap-dp",
-                N_("ignore LDAP CRL distribution points")),
-  ARGPARSE_s_n (oIgnoreOCSPSvcUrl, "ignore-ocsp-service-url",
-                N_("ignore certificate contained OCSP service URLs")),
-
   ARGPARSE_s_s (oHTTPProxy,  "http-proxy",
                 N_("|URL|redirect all HTTP requests to URL")),
+  ARGPARSE_s_n (oHonorHTTPProxy, "honor-http-proxy",
+                N_("use system's HTTP proxy setting")),
+  ARGPARSE_s_s (oLDAPWrapperProgram, "ldap-wrapper-program", "@"),
+
+
+  ARGPARSE_header ("LDAP", N_("Configuration of LDAP servers to use")),
+
+  ARGPARSE_s_n (oDisableLDAP, "disable-ldap", N_("inhibit the use of LDAP")),
+  ARGPARSE_s_n (oIgnoreLDAPDP,"ignore-ldap-dp",
+                N_("ignore LDAP CRL distribution points")),
   ARGPARSE_s_s (oLDAPProxy,  "ldap-proxy",
                 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",
@@ -223,6 +275,12 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_i (oLDAPTimeout, "ldaptimeout",
                 N_("|N|set LDAP timeout to N seconds")),
 
+
+  ARGPARSE_header ("OCSP", N_("Configuration for OCSP")),
+
+  ARGPARSE_s_n (oAllowOCSP, "allow-ocsp", N_("allow sending OCSP requests")),
+  ARGPARSE_s_n (oIgnoreOCSPSvcUrl, "ignore-ocsp-service-url",
+                N_("ignore certificate contained OCSP service URLs")),
   ARGPARSE_s_s (oOCSPResponder, "ocsp-responder",
                 N_("|URL|use OCSP responder at URL")),
   ARGPARSE_s_s (oOCSPSigner, "ocsp-signer",
@@ -231,43 +289,19 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_i (oOCSPMaxPeriod,    "ocsp-max-period", "@"),
   ARGPARSE_s_i (oOCSPCurrentPeriod, "ocsp-current-period", "@"),
 
-  ARGPARSE_s_i (oMaxReplies, "max-replies",
-                N_("|N|do not return more than N items in one query")),
 
-  ARGPARSE_s_s (oNameServer, "nameserver", "@"),
-  ARGPARSE_s_s (oKeyServer, "keyserver", "@"),
-  ARGPARSE_s_s (oHkpCaCert, "hkp-cacert",
-                N_("|FILE|use the CA certificates in FILE for HKP over TLS")),
+  ARGPARSE_header (NULL, N_("Other options")),
 
-  ARGPARSE_s_n (oUseTor, "use-tor", N_("route all network traffic via Tor")),
-  ARGPARSE_s_n (oNoUseTor, "no-use-tor", "@"),
+  ARGPARSE_s_n (oForce,    "force",    N_("force loading of outdated CRLs")),
+  ARGPARSE_s_s (oSocketName, "socket-name", "@"),  /* Only for debugging.  */
 
-  ARGPARSE_s_n (oDisableIPv4, "disable-ipv4", "@"),
-  ARGPARSE_s_n (oDisableIPv6, "disable-ipv6", "@"),
 
-  ARGPARSE_s_s (oSocketName, "socket-name", "@"),  /* Only for debugging.  */
+  ARGPARSE_header (NULL, ""),  /* Stop the header group.  */
 
-  ARGPARSE_s_u (oFakedSystemTime, "faked-system-time", "@"), /*(epoch time)*/
-  ARGPARSE_s_s (oDebug,    "debug", "@"),
-  ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
-  ARGPARSE_s_i (oGnutlsDebug, "gnutls-debug", "@"),
-  ARGPARSE_s_i (oGnutlsDebug, "tls-debug", "@"),
-  ARGPARSE_s_i (oDebugWait, "debug-wait", "@"),
-  ARGPARSE_s_n (oDisableCheckOwnSocket, "disable-check-own-socket", "@"),
-  ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
-  ARGPARSE_s_s (oHomedir, "homedir", "@"),
-  ARGPARSE_s_s (oLDAPWrapperProgram, "ldap-wrapper-program", "@"),
+  /* Not yet used options.  */
+  ARGPARSE_s_n (oBatch,    "batch",       "@"),
   ARGPARSE_s_s (oHTTPWrapperProgram, "http-wrapper-program", "@"),
-  ARGPARSE_s_n (oHonorHTTPProxy, "honor-http-proxy", "@"),
-  ARGPARSE_s_s (oIgnoreCertExtension,"ignore-cert-extension", "@"),
-  ARGPARSE_s_s (oIgnoreCert,"ignore-cert", "@"),
-  ARGPARSE_s_n (oStandardResolver, "standard-resolver", "@"),
-  ARGPARSE_s_n (oRecursiveResolver, "recursive-resolver", "@"),
-  ARGPARSE_s_i (oResolverTimeout, "resolver-timeout", "@"),
-  ARGPARSE_s_i (oConnectTimeout, "connect-timeout", "@"),
-  ARGPARSE_s_i (oConnectQuickTimeout, "connect-quick-timeout", "@"),
-  ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
-  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
+
 
   ARGPARSE_group (302,N_("@\n(See the \"info\" manual for a complete listing "
                          "of all commands and options)\n")),
@@ -587,6 +621,15 @@ dirmngr_use_tor (void)
 }
 
 
+/* This is somewhat similar to dirmngr_use_tor but avoids a trial
+ * connect and may thus be faster for this special case.  */
+int
+dirmngr_never_use_tor_p (void)
+{
+  return tor_mode == TOR_MODE_NEVER;
+}
+
+
 static void
 wrong_args (const char *text)
 {
@@ -1544,68 +1587,19 @@ main (int argc, char **argv)
   else if (cmd == aGPGConfList)
     {
       unsigned long flags = 0;
-      char *filename;
       char *filename_esc;
 
-      filename = percent_escape (opt.config_filename, NULL);
-      es_printf ("gpgconf-dirmngr.conf:%lu:\"%s\n",
-              GC_OPT_FLAG_DEFAULT, filename);
-      xfree (filename);
-
-      es_printf ("verbose:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("quiet:%lu:\n", flags | GC_OPT_FLAG_NONE);
       es_printf ("debug-level:%lu:\"none\n", flags | GC_OPT_FLAG_DEFAULT);
-      es_printf ("log-file:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("force:%lu:\n", flags | GC_OPT_FLAG_NONE);
-
-      /* --csh and --sh are mutually exclusive, something we can not
-         express in GPG Conf.  --options is only usable from the
-         command line, really.  --debug-all interacts with --debug,
-         and having both of them is thus problematic.  --no-detach is
-         also only usable on the command line.  --batch is unused.  */
-
-      filename = make_filename (gnupg_homedir (),
-                                "dirmngr_ldapservers.conf",
-                                NULL);
-      filename_esc = percent_escape (filename, NULL);
-      es_printf ("ldapserverlist-file:%lu:\"%s\n", flags | GC_OPT_FLAG_DEFAULT,
-	      filename_esc);
-      xfree (filename_esc);
-      xfree (filename);
-
       es_printf ("ldaptimeout:%lu:%u\n",
-              flags | GC_OPT_FLAG_DEFAULT, DEFAULT_LDAP_TIMEOUT);
+                 flags | GC_OPT_FLAG_DEFAULT, DEFAULT_LDAP_TIMEOUT);
       es_printf ("max-replies:%lu:%u\n",
-              flags | GC_OPT_FLAG_DEFAULT, DEFAULT_MAX_REPLIES);
-      es_printf ("allow-ocsp:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("allow-version-check:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("ocsp-responder:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("ocsp-signer:%lu:\n", flags | GC_OPT_FLAG_NONE);
-
-      es_printf ("faked-system-time:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("no-greeting:%lu:\n", flags | GC_OPT_FLAG_NONE);
-
-      es_printf ("disable-http:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("disable-ldap:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("honor-http-proxy:%lu\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("http-proxy:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("ldap-proxy:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("only-ldap-proxy:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("ignore-ldap-dp:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("ignore-http-dp:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      es_printf ("ignore-ocsp-service-url:%lu:\n", flags | GC_OPT_FLAG_NONE);
-      /* Note: The next one is to fix a typo in gpgconf - should be
-         removed eventually. */
-      es_printf ("ignore-ocsp-servic-url:%lu:\n", flags | GC_OPT_FLAG_NONE);
-
-      es_printf ("use-tor:%lu:\n", flags | GC_OPT_FLAG_NONE);
+                 flags | GC_OPT_FLAG_DEFAULT, DEFAULT_MAX_REPLIES);
 
       filename_esc = percent_escape (get_default_keyserver (0), NULL);
       es_printf ("keyserver:%lu:\"%s:\n", flags | GC_OPT_FLAG_DEFAULT,
                  filename_esc);
       xfree (filename_esc);
 
-      es_printf ("nameserver:%lu:\n", flags | GC_OPT_FLAG_NONE);
       es_printf ("resolver-timeout:%lu:%u\n",
                  flags | GC_OPT_FLAG_DEFAULT, 0);
     }
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h
index 69d8270..159fab4 100644
--- a/dirmngr/dirmngr.h
+++ b/dirmngr/dirmngr.h
@@ -224,6 +224,7 @@ void dirmngr_deinit_default_ctrl (ctrl_t ctrl);
 void dirmngr_sighup_action (void);
 const char* dirmngr_get_current_socket_name (void);
 int dirmngr_use_tor (void);
+int dirmngr_never_use_tor_p (void);
 
 /*-- Various housekeeping functions.  --*/
 void ks_hkp_housekeeping (time_t curtime);
diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c
index e37a0a8..ea0da6c 100644
--- a/dirmngr/dirmngr_ldap.c
+++ b/dirmngr/dirmngr_ldap.c
@@ -747,7 +747,7 @@ print_ldap_entries (LDAP *ld, LDAPMessage *msg, char *want_attr)
 
 /* Fetch data from the server at LD using FILTER.  */
 static int
-fetch_ldap (LDAP *ld, const char *base, int scope, const char *filter)
+fetch_ldap (LDAP *ld, char *base, int scope, char *filter)
 {
   gpg_error_t err;
   int lerr;
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
index 611e536..ef7a717 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -1533,7 +1533,7 @@ ks_hkp_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
 
     xfree (request);
     request = strconcat (hostport,
-                         "/pks/lookup?op=index&options=mr&search=",
+                         "/pks/lookup?op=index&options=mr&fingerprint=on&search=",
                          searchkey,
                          NULL);
     xfree (searchkey);
diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c
index afc7f56..6bf19cb 100644
--- a/dirmngr/ks-engine-ldap.c
+++ b/dirmngr/ks-engine-ldap.c
@@ -544,8 +544,13 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
     }
   else if (bindname)
     {
+
       npth_unprotect ();
-      lerr = ldap_simple_bind_s (ldap_conn, bindname, password);
+      /* Older Windows header dont have the const for the last two args.
+       * Thus we need to cast to avoid warnings.  */
+      lerr = ldap_simple_bind_s (ldap_conn,
+                                 (char * const)bindname,
+                                 (char * const)password);
       npth_protect ();
       if (lerr != LDAP_SUCCESS)
 	{
diff --git a/dirmngr/ldap-url.c b/dirmngr/ldap-url.c
index 8308514..0cb5d4a 100644
--- a/dirmngr/ldap-url.c
+++ b/dirmngr/ldap-url.c
@@ -100,6 +100,25 @@ void ldap_pvt_hex_unescape( char *s );
 # define LDAP_SCOPE_DEFAULT -1
 #endif
 
+#if __GNUC__
+# define MY_GCC_VERSION (__GNUC__ * 10000 \
+                         + __GNUC_MINOR__ * 100 \
+                         + __GNUC_PATCHLEVEL__)
+#else
+# define MY_GCC_VERSION 0
+#endif
+
+
+/* Avoid warnings about strncpy usage.  */
+#if MY_GCC_VERSION >= 80000
+# pragma GCC diagnostic ignored "-Wstringop-truncation"
+# pragma GCC diagnostic ignored "-Wstringop-overflow"
+#elif defined __clang__
+# pragma clang diagnostic ignored "-Wstringop-truncation"
+# pragma clang diagnostic ignored "-Wstringop-overflow"
+#endif
+
+
 
 
 /* $OpenLDAP: pkg/ldap/libraries/libldap/charray.c,v 1.9.2.2 2003/03/03 17:10:04 kurt Exp $ */
diff --git a/dirmngr/ocsp.c b/dirmngr/ocsp.c
index eaa6ca2..3483ab9 100644
--- a/dirmngr/ocsp.c
+++ b/dirmngr/ocsp.c
@@ -519,8 +519,11 @@ check_signature (ctrl_t ctrl,
           /* dump_cert ("from ocsp response", cert); */
           cref = xtrymalloc (sizeof *cref);
           if (!cref)
-            log_error (_("allocating list item failed: %s\n"),
-                       gcry_strerror (err));
+            {
+              err = gpg_error_from_syserror ();
+              log_error (_("allocating list item failed: %s\n"),
+                         gpg_strerror (err));
+            }
           else if (!cache_cert_silent (cert, &cref->fpr))
             {
               cref->next = ctrl->ocsp_certs;
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 4d2bd4c..afdb0d2 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -924,7 +924,14 @@ proc_wkd_get (ctrl_t ctrl, assuan_context_t ctx, char *line)
 
       err = get_dns_srv (domain, "openpgpkey", NULL, &srvs, &srvscount);
       if (err)
-        goto leave;
+        {
+          /* Ignore server failed becuase there are too many resolvers
+           * which do not work as expected.  */
+          if (gpg_err_code (err) == GPG_ERR_SERVER_FAILED)
+            err = 0; /*(srvcount is guaranteed to be 0)*/
+          else
+            goto leave;
+        }
 
       /* Check for rogue DNS names.  */
       for (i = 0; i < srvscount; i++)
@@ -1005,7 +1012,7 @@ proc_wkd_get (ctrl_t ctrl, assuan_context_t ctx, char *line)
     {
       char *escapedmbox;
 
-      escapedmbox = http_escape_string (mbox, "%;?&=");
+      escapedmbox = http_escape_string (mbox, "%;?&=+#");
       if (escapedmbox)
         {
           uri = strconcat ("https://",
@@ -2276,7 +2283,7 @@ ensure_keyserver (ctrl_t ctrl)
     {
       /* If there is just one onion and one plain keyserver given, we take
          only one depending on whether Tor is running or not.  */
-      if (is_tor_running (ctrl))
+      if (!dirmngr_never_use_tor_p () && is_tor_running (ctrl))
         {
           ctrl->server_local->keyservers = onion_items;
           onion_items = NULL;
@@ -2287,7 +2294,7 @@ ensure_keyserver (ctrl_t ctrl)
           plain_items = NULL;
         }
     }
-  else if (!is_tor_running (ctrl))
+  else if (dirmngr_never_use_tor_p () || !is_tor_running (ctrl))
     {
       /* Tor is not running.  It does not make sense to add Onion
          addresses.  */
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8bb7333..aba09b9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -24,6 +24,7 @@ include $(top_srcdir)/am/cmacros.am
 examples = examples/README examples/scd-event examples/trustlist.txt	\
 	   examples/VS-NfD.prf examples/Automatic.prf                   \
            examples/debug.prf                                           \
+           examples/gpgconf.rnames examples/gpgconf.conf                \
 	   examples/systemd-user/README 				\
 	   examples/systemd-user/dirmngr.service 			\
 	   examples/systemd-user/dirmngr.socket				\
@@ -32,7 +33,7 @@ examples = examples/README examples/scd-event examples/trustlist.txt	\
 	   examples/systemd-user/gpg-agent-ssh.socket 			\
 	   examples/systemd-user/gpg-agent-browser.socket		\
 	   examples/systemd-user/gpg-agent-extra.socket 		\
-	   examples/gpgconf.conf examples/pwpattern.list
+	   examples/pwpattern.list
 
 helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt		\
             help.da.txt help.de.txt help.el.txt help.eo.txt		\
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 5819da1..59b671f 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -310,6 +310,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
@@ -477,6 +478,7 @@ libcommontlsnpth = ../common/libcommontlsnpth.a
 examples = examples/README examples/scd-event examples/trustlist.txt	\
 	   examples/VS-NfD.prf examples/Automatic.prf                   \
            examples/debug.prf                                           \
+           examples/gpgconf.rnames examples/gpgconf.conf                \
 	   examples/systemd-user/README 				\
 	   examples/systemd-user/dirmngr.service 			\
 	   examples/systemd-user/dirmngr.socket				\
@@ -485,7 +487,7 @@ examples = examples/README examples/scd-event examples/trustlist.txt	\
 	   examples/systemd-user/gpg-agent-ssh.socket 			\
 	   examples/systemd-user/gpg-agent-browser.socket		\
 	   examples/systemd-user/gpg-agent-extra.socket 		\
-	   examples/gpgconf.conf examples/pwpattern.list
+	   examples/pwpattern.list
 
 helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt		\
             help.da.txt help.de.txt help.el.txt help.eo.txt		\
diff --git a/doc/defsincdate b/doc/defsincdate
index ea92209..e07e00b 100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@ -1 +1 @@
-1637611516
+1660898960
diff --git a/doc/examples/gpgconf.conf b/doc/examples/gpgconf.conf
index 95e463b..a61d4d4 100644
--- a/doc/examples/gpgconf.conf
+++ b/doc/examples/gpgconf.conf
@@ -5,6 +5,10 @@
 # defaults in gpgconf and to enforce certain values for the various
 # GnuPG related configuration files.
 #
+# NOTE: This is a legacy mechanism.  The modern way is to use global
+#       configuration files like /etc/gnupg/gpg.conf which are more
+#       flexible and better integrated into the configuration system.
+#
 # Empty lines and comment lines, indicated by a hash mark as first non
 # white space character, are ignored.  The line is separated by white
 # space into fields. The first field is used to match the user or
@@ -56,7 +60,3 @@
 # "enable-ocsp" is put into the config file of gpgsm.  The latter may
 # be changed by any user.
 #-------------------------------------------------------------------
-
-
-
-
diff --git a/doc/examples/gpgconf.rnames b/doc/examples/gpgconf.rnames
new file mode 100644
index 0000000..0e83732
--- /dev/null
+++ b/doc/examples/gpgconf.rnames
@@ -0,0 +1,12 @@
+# gpgconf-rnames.lst
+# Additional registry settings to be shown by "gpgconf -X".
+#
+# Example: HKCU\Software\GNU\GnuPG:FooBar
+#
+#  HKCU := The class.  Other supported classes are HKLM, HKCR, HKU,
+#          and HKCC.  If no class is given and the string thus starts
+#          with a backslash HKCU with a fallback to HKLM is used.
+#  Software\GNU\GnuPG := The actual key.
+#  FooBar := The name of the item.  if a name is not given the default
+#            value is used.
+#
diff --git a/doc/gnupg-card-architecture.pdf b/doc/gnupg-card-architecture.pdf
index b1b109e..9e977bc 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 d0c0056..78f15ea 100644
--- a/doc/gnupg-module-overview.pdf
+++ b/doc/gnupg-module-overview.pdf
@@ -344,8 +344,8 @@ endobj
 17 0 obj
 <<
 /Title (þÿ
-/CreationDate (D:20211123110221)
-/ModDate (D:20211123110221)
+/CreationDate (D:20220824153320)
+/ModDate (D:20220824153320)
 /Producer (https://imagemagick.org)
 >>
 endobj
diff --git a/doc/gnupg-module-overview.png b/doc/gnupg-module-overview.png
index 42dab3e..3c9085f 100644
--- a/doc/gnupg-module-overview.png
+++ b/doc/gnupg-module-overview.png
diff --git a/doc/gnupg.info b/doc/gnupg.info
index aac1a88..bb476c8 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.2.33-beta28,
-November 2021).
+This is the 'The GNU Privacy Guard Manual' (version 2.2.37-beta27,
+August 2022).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -23,201 +23,202 @@ END-INFO-DIR-ENTRY
 
 
 Indirect:
-gnupg.info-1: 992
-gnupg.info-2: 302610
+gnupg.info-1: 990
+gnupg.info-2: 305285
 
 Tag Table:
 (Indirect)
-Node: Top992
-Node: Installation2921
-Node: Invoking GPG-AGENT5270
-Node: Agent Commands7036
-Node: Agent Options8840
-Ref: option --options9120
-Ref: option --homedir9446
-Ref: option --log-file14864
-Ref: option --no-allow-mark-trusted15237
-Ref: option --allow-preset-passphrase15441
-Ref: option --no-allow-loopback-pinentry15594
-Ref: option --extra-socket23947
-Ref: option --enable-ssh-support25413
-Ref: option --ssh-fingerprint-digest27750
-Node: Agent Configuration29407
-Node: Agent Signals34805
-Node: Agent Examples36265
-Node: Agent Protocol36832
-Node: Agent PKDECRYPT38986
-Node: Agent PKSIGN40898
-Node: Agent GENKEY43202
-Node: Agent IMPORT45099
-Node: Agent EXPORT45543
-Node: Agent ISTRUSTED45758
-Node: Agent GET_PASSPHRASE48133
-Node: Agent CLEAR_PASSPHRASE50574
-Node: Agent PRESET_PASSPHRASE50965
-Node: Agent GET_CONFIRMATION51803
-Node: Agent HAVEKEY52475
-Node: Agent LEARN53107
-Node: Agent PASSWD53405
-Node: Agent UPDATESTARTUPTTY53871
-Node: Agent GETEVENTCOUNTER54349
-Node: Agent GETINFO55151
-Node: Agent OPTION55855
-Node: Invoking DIRMNGR58913
-Node: Dirmngr Commands59811
-Node: Dirmngr Options62264
-Ref: Dirmngr Options-Footnote-180403
-Node: Dirmngr Configuration80538
-Node: Dirmngr Signals83668
-Node: Dirmngr Examples84696
-Node: Dirmngr Protocol85378
-Node: Dirmngr LOOKUP86028
-Node: Dirmngr ISVALID87399
-Node: Dirmngr CHECKCRL89972
-Node: Dirmngr CHECKOCSP91029
-Node: Dirmngr CACHECERT92335
-Node: Dirmngr VALIDATE93174
-Node: Invoking GPG93742
-Node: GPG Commands94972
-Node: General GPG Commands95866
-Node: Operational GPG Commands96555
-Ref: option --export-ownertrust113856
-Node: OpenPGP Key Management115969
-Node: GPG Options137928
-Node: GPG Configuration Options139261
-Ref: gpg-option --options152799
-Ref: trust-model-tofu157367
-Node: GPG Key related Options177685
-Node: GPG Input and Output182881
-Node: OpenPGP Options196585
-Node: Compliance Options201313
-Node: GPG Esoteric Options204679
-Ref: GPG Esoteric Options-Footnote-1232401
-Node: Deprecated Options232555
-Node: GPG Configuration234058
-Node: GPG Examples239724
-Node: Unattended Usage of GPG248534
-Node: Programmatic use of GnuPG249165
-Node: Ephemeral home directories249716
-Node: The quick key manipulation interface251023
-Node: Unattended GPG key generation251610
-Node: Invoking GPGSM260929
-Node: GPGSM Commands261798
-Node: General GPGSM Commands262236
-Node: Operational GPGSM Commands262924
-Node: Certificate Management264958
-Node: GPGSM Options269934
-Node: Configuration Options270508
-Ref: gpgsm-option --options270777
-Node: Certificate Options274057
-Ref: gpgsm-option --validation-model277661
-Node: Input and Output278641
-Ref: option --p12-charset279224
-Ref: gpgsm-option --with-key-data280468
-Ref: gpgsm-option --with-validation280742
-Node: CMS Options281620
-Node: Esoteric Options282640
-Node: GPGSM Configuration288393
-Node: GPGSM Examples294061
-Node: Unattended Usage294258
-Node: Automated signature checking294849
-Node: CSR and certificate creation296672
-Node: GPGSM Protocol302610
-Node: GPGSM ENCRYPT303866
-Node: GPGSM DECRYPT306541
-Node: GPGSM SIGN307377
-Node: GPGSM VERIFY308833
-Node: GPGSM GENKEY309349
-Node: GPGSM LISTKEYS310364
-Ref: gpgsm-cmd listkeys310523
-Node: GPGSM EXPORT311276
-Node: GPGSM IMPORT312240
-Node: GPGSM DELETE312981
-Node: GPGSM GETAUDITLOG313488
-Ref: gpgsm-cmd getauditlog313657
-Node: GPGSM GETINFO314001
-Node: GPGSM OPTION314850
-Node: Invoking SCDAEMON318203
-Node: Scdaemon Commands318877
-Node: Scdaemon Options320005
-Node: Card applications329355
-Node: OpenPGP Card330020
-Node: NKS Card330493
-Node: DINSIG Card330819
-Node: PKCS#15 Card331195
-Node: Geldkarte Card331465
-Node: SmartCard-HSM331856
-Node: Undefined Card332452
-Node: Scdaemon Configuration332865
-Node: Scdaemon Examples333903
-Node: Scdaemon Protocol334086
-Node: Scdaemon SERIALNO335605
-Node: Scdaemon LEARN336451
-Node: Scdaemon READCERT337298
-Node: Scdaemon READKEY337700
-Node: Scdaemon PKSIGN337986
-Node: Scdaemon PKDECRYPT338712
-Node: Scdaemon GETATTR339462
-Node: Scdaemon SETATTR339664
-Node: Scdaemon WRITEKEY339869
-Node: Scdaemon GENKEY340571
-Node: Scdaemon RANDOM340774
-Node: Scdaemon PASSWD340997
-Node: Scdaemon CHECKPIN341388
-Node: Scdaemon RESTART342391
-Node: Scdaemon APDU342924
-Node: Specify a User ID343897
-Ref: how-to-specify-a-user-id344055
-Node: Trust Values348913
-Ref: trust-values349042
-Node: Helper Tools349647
-Node: watchgnupg350499
-Ref: option watchgnupg --tcp351321
-Node: gpgv352899
-Node: addgnupghome358098
-Node: gpgconf358794
-Ref: gpgconf-Footnote-1360981
-Node: Invoking gpgconf361279
-Node: Format conventions367864
-Node: Listing components373195
-Node: Checking programs375278
-Node: Listing options378016
-Node: Changing options385722
-Node: Listing global options387424
-Node: Querying versions389195
-Node: Files used by gpgconf391893
-Node: applygnupgdefaults392369
-Node: gpg-preset-passphrase393113
-Node: Invoking gpg-preset-passphrase394148
-Node: gpg-connect-agent395550
-Node: Invoking gpg-connect-agent396264
-Node: Controlling gpg-connect-agent399810
-Node: dirmngr-client406283
-Node: gpgparsemail409634
-Node: gpgtar409947
-Node: gpg-check-pattern413906
-Node: Web Key Service416208
-Node: gpg-wks-client416521
-Node: gpg-wks-server421686
-Node: Howtos427043
-Node: Howto Create a Server Cert427315
-Node: System Notes435728
-Node: W32 Notes436939
-Node: Debugging437361
-Node: Debugging Tools438189
-Node: kbxutil438469
-Node: Debugging Hints440000
-Node: Common Problems441131
-Node: Architecture Details446368
-Node: Component interaction446678
-Ref: fig:moduleoverview446864
-Node: GnuPG-1 and GnuPG-2446971
-Ref: fig:cardarchitecture447261
-Node: Copying447376
-Node: Contributors484900
-Node: Glossary491155
-Node: Option Index493674
-Node: Environment Index574166
-Node: Index579686
+Node: Top990
+Node: Installation2917
+Node: Invoking GPG-AGENT5266
+Node: Agent Commands7032
+Node: Agent Options8836
+Ref: option --options9116
+Ref: option --homedir9442
+Ref: option --log-file14860
+Ref: option --no-allow-mark-trusted15233
+Ref: option --no-user-trustlist15437
+Ref: option --allow-preset-passphrase15903
+Ref: option --no-allow-loopback-pinentry16056
+Ref: option --extra-socket24409
+Ref: option --enable-ssh-support25875
+Ref: option --ssh-fingerprint-digest28212
+Node: Agent Configuration29869
+Node: Agent Signals35359
+Node: Agent Examples36819
+Node: Agent Protocol37386
+Node: Agent PKDECRYPT39540
+Node: Agent PKSIGN41452
+Node: Agent GENKEY43756
+Node: Agent IMPORT45653
+Node: Agent EXPORT46097
+Node: Agent ISTRUSTED46312
+Node: Agent GET_PASSPHRASE48687
+Node: Agent CLEAR_PASSPHRASE51128
+Node: Agent PRESET_PASSPHRASE51519
+Node: Agent GET_CONFIRMATION52357
+Node: Agent HAVEKEY53029
+Node: Agent LEARN53661
+Node: Agent PASSWD53959
+Node: Agent UPDATESTARTUPTTY54425
+Node: Agent GETEVENTCOUNTER54903
+Node: Agent GETINFO55705
+Node: Agent OPTION56409
+Node: Invoking DIRMNGR59467
+Node: Dirmngr Commands60365
+Node: Dirmngr Options62818
+Ref: Dirmngr Options-Footnote-180957
+Node: Dirmngr Configuration81092
+Node: Dirmngr Signals84222
+Node: Dirmngr Examples85250
+Node: Dirmngr Protocol85932
+Node: Dirmngr LOOKUP86582
+Node: Dirmngr ISVALID87953
+Node: Dirmngr CHECKCRL90526
+Node: Dirmngr CHECKOCSP91583
+Node: Dirmngr CACHECERT92889
+Node: Dirmngr VALIDATE93728
+Node: Invoking GPG94296
+Node: GPG Commands95526
+Node: General GPG Commands96420
+Node: Operational GPG Commands97109
+Ref: option --export-ownertrust114410
+Node: OpenPGP Key Management116523
+Node: GPG Options138482
+Node: GPG Configuration Options139815
+Ref: gpg-option --options153353
+Ref: trust-model-tofu157921
+Node: GPG Key related Options178239
+Node: GPG Input and Output183435
+Node: OpenPGP Options197139
+Node: Compliance Options201867
+Node: GPG Esoteric Options205811
+Ref: GPG Esoteric Options-Footnote-1233533
+Node: Deprecated Options233687
+Node: GPG Configuration235190
+Node: GPG Examples241078
+Node: Unattended Usage of GPG249888
+Node: Programmatic use of GnuPG250519
+Node: Ephemeral home directories251070
+Node: The quick key manipulation interface252377
+Node: Unattended GPG key generation252964
+Node: Invoking GPGSM262283
+Node: GPGSM Commands263152
+Node: General GPGSM Commands263590
+Node: Operational GPGSM Commands264278
+Node: Certificate Management266312
+Node: GPGSM Options271288
+Node: Configuration Options271862
+Ref: gpgsm-option --options272131
+Node: Certificate Options275254
+Ref: gpgsm-option --validation-model278858
+Node: Input and Output279838
+Ref: option --p12-charset280421
+Ref: gpgsm-option --with-key-data281665
+Ref: gpgsm-option --with-validation281939
+Node: CMS Options282817
+Node: Esoteric Options283837
+Node: GPGSM Configuration291070
+Node: GPGSM Examples296738
+Node: Unattended Usage296935
+Node: Automated signature checking297526
+Node: CSR and certificate creation299349
+Node: GPGSM Protocol305285
+Node: GPGSM ENCRYPT306541
+Node: GPGSM DECRYPT309216
+Node: GPGSM SIGN310052
+Node: GPGSM VERIFY311508
+Node: GPGSM GENKEY312024
+Node: GPGSM LISTKEYS313039
+Ref: gpgsm-cmd listkeys313198
+Node: GPGSM EXPORT313951
+Node: GPGSM IMPORT314915
+Node: GPGSM DELETE315656
+Node: GPGSM GETAUDITLOG316163
+Ref: gpgsm-cmd getauditlog316332
+Node: GPGSM GETINFO316676
+Node: GPGSM OPTION317525
+Node: Invoking SCDAEMON320878
+Node: Scdaemon Commands321552
+Node: Scdaemon Options322680
+Node: Card applications332122
+Node: OpenPGP Card332787
+Node: NKS Card333260
+Node: DINSIG Card333586
+Node: PKCS#15 Card333962
+Node: Geldkarte Card334232
+Node: SmartCard-HSM334623
+Node: Undefined Card335219
+Node: Scdaemon Configuration335632
+Node: Scdaemon Examples336670
+Node: Scdaemon Protocol336853
+Node: Scdaemon SERIALNO338372
+Node: Scdaemon LEARN339218
+Node: Scdaemon READCERT340065
+Node: Scdaemon READKEY340467
+Node: Scdaemon PKSIGN340753
+Node: Scdaemon PKDECRYPT341479
+Node: Scdaemon GETATTR342229
+Node: Scdaemon SETATTR342431
+Node: Scdaemon WRITEKEY342636
+Node: Scdaemon GENKEY343338
+Node: Scdaemon RANDOM343541
+Node: Scdaemon PASSWD343764
+Node: Scdaemon CHECKPIN344155
+Node: Scdaemon RESTART345158
+Node: Scdaemon APDU345691
+Node: Specify a User ID346664
+Ref: how-to-specify-a-user-id346822
+Node: Trust Values351680
+Ref: trust-values351809
+Node: Helper Tools352414
+Node: watchgnupg353266
+Ref: option watchgnupg --tcp354088
+Node: gpgv355666
+Node: addgnupghome360865
+Node: gpgconf361561
+Ref: gpgconf-Footnote-1363748
+Node: Invoking gpgconf364046
+Node: Format conventions370738
+Node: Listing components376069
+Node: Checking programs378152
+Node: Listing options380890
+Node: Changing options388596
+Node: Listing global options390298
+Node: Querying versions392278
+Node: Files used by gpgconf394976
+Node: applygnupgdefaults395582
+Node: gpg-preset-passphrase396452
+Node: Invoking gpg-preset-passphrase397487
+Node: gpg-connect-agent398889
+Node: Invoking gpg-connect-agent399603
+Node: Controlling gpg-connect-agent403149
+Node: dirmngr-client409622
+Node: gpgparsemail412973
+Node: gpgtar413286
+Node: gpg-check-pattern418014
+Node: Web Key Service420316
+Node: gpg-wks-client420629
+Node: gpg-wks-server425794
+Node: Howtos431151
+Node: Howto Create a Server Cert431423
+Node: System Notes439836
+Node: W32 Notes441047
+Node: Debugging441469
+Node: Debugging Tools442297
+Node: kbxutil442577
+Node: Debugging Hints444108
+Node: Common Problems445239
+Node: Architecture Details450476
+Node: Component interaction450786
+Ref: fig:moduleoverview450972
+Node: GnuPG-1 and GnuPG-2451079
+Ref: fig:cardarchitecture451369
+Node: Copying451484
+Node: Contributors489008
+Node: Glossary495263
+Node: Option Index497782
+Node: Environment Index579013
+Node: Index584606
 
 End Tag Table
diff --git a/doc/gnupg.info-1 b/doc/gnupg.info-1
index 2130255..d1f9ca2 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.2.33-beta28,
-November 2021).
+This is the 'The GNU Privacy Guard Manual' (version 2.2.37-beta27,
+August 2022).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -27,8 +27,8 @@ File: gnupg.info,  Node: Top,  Next: Installation,  Up: (dir)
 Using the GNU Privacy Guard
 ***************************
 
-This is the 'The GNU Privacy Guard Manual' (version 2.2.33-beta28,
-November 2021).
+This is the 'The GNU Privacy Guard Manual' (version 2.2.37-beta27,
+August 2022).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -394,6 +394,17 @@ the two leading dashes, in the configuration file.
      the 'trustlist.txt' file.  This makes it harder for users to
      inadvertently accept Root-CA keys.
 
+'--no-user-trustlist'
+     Entirely ignore the user trust list and consider only the global
+     trustlist ('/etc/gnupg/trustlist.txt').  This implies the *note
+     option --no-allow-mark-trusted::.
+
+'--sys-trustlist-name FILE'
+     Changes the default name for the global trustlist from
+     "trustlist.txt" to FILE.  If FILE does not contain any slashes and
+     does not start with "~/" it is searched in the system configuration
+     directory ('/etc/gnupg').
+
 '--allow-preset-passphrase'
      This option allows the use of 'gpg-preset-passphrase' to seed the
      internal cache of 'gpg-agent' with passphrases.
@@ -756,7 +767,9 @@ agent.  By default they may all be found in the current home directory
 
      As a special feature a line 'include-default' will include a global
      list of trusted certificates (e.g.  '/etc/gnupg/trustlist.txt').
-     This global list is also used if the local list is not available.
+     This global list is also used if the local list is not available;
+     the *note option --no-user-trustlist:: enforces the use of only
+     this global list.
 
      It is possible to add further flags after the 'S' for use by the
      caller:
@@ -4811,6 +4824,16 @@ OPENPGP PROGRAMS section below before using one of these options.
      size requirements.  For example, a value of 3000 turns rsa2048 and
      dsa2048 keys into non-VS-NfD compliant keys.
 
+'--require-compliance'
+     To check that data has been encrypted according to the rules of the
+     current compliance mode, a gpg user needs to evaluate the status
+     lines.  This is allows frontends to handle compliance check in a
+     more flexible way.  However, for scripted use the required
+     evaluation of the status-line requires quite some effort; this
+     option can be used instead to make sure that the gpg process exits
+     with a failure if the compliance rules are not fulfilled.  Note
+     that this option has currently an effect only in "de-vs" mode.
+
 
 File: gnupg.info,  Node: GPG Esoteric Options,  Next: Deprecated Options,  Prev: Compliance Options,  Up: GPG Options
 
@@ -5604,6 +5627,11 @@ GNUPG_BUILD_ROOT
      under operating systems without proper support to figure out the
      name of a process' text file.
 
+GNUPG_EXEC_DEBUG_FLAGS
+     This variable allows to enable diagnostics for process management.
+     A numeric decimal value is expected.  Bit 0 enables general
+     diagnostics, bit 1 enables certain warnings on Windows.
+
    When calling the gpg-agent component 'gpg' sends a set of environment
 variables to gpg-agent.  The names of these variables can be listed
 using the command:
@@ -6425,14 +6453,12 @@ 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 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.
+     This is a deprecated option.  It was used to add an LDAP server to
+     use for X.509 certificate and CRL lookup.  The alias '--ldapserver'
+     existed from version 2.2.28 to 2.2.33 but is now entirely ignored.
+
+     LDAP servers must be given in the configuration for 'dirmngr'.
 
 '--policy-file FILENAME'
      Change the default name of the policy file to FILENAME.
@@ -6690,6 +6716,25 @@ File: gnupg.info,  Node: Esoteric Options,  Prev: CMS Options,  Up: GPGSM Option
      size requirements.  For example, a value of 3000 turns rsa2048 and
      dsa2048 keys into non-VS-NfD compliant keys.
 
+'--require-compliance'
+     To check that data has been encrypted according to the rules of the
+     current compliance mode, a gpgsm user needs to evaluate the status
+     lines.  This is allows frontends to handle compliance check in a
+     more flexible way.  However, for scripted use the required
+     evaluation of the status-line requires quite some effort; this
+     option can be used instead to make sure that the gpgsm process
+     exits with a failure if the compliance rules are not fulfilled.
+     Note that this option has currently an effect only in "de-vs" mode.
+
+'--ignore-cert-with-oid OID'
+     Add OID to the list of OIDs to be checked while reading
+     certificates from smartcards.  The OID is expected to be in dotted
+     decimal form, like '2.5.29.3'.  This option may be used more than
+     once.  As of now certificates with an extended key usage matching
+     one of those OIDs are ignored during a '--learn-card' operation and
+     not imported.  This option can help to keep the local key database
+     clear of unneeded certificates stored on smartcards.
+
 '--faked-system-time EPOCH'
      This option is only useful for testing; it sets the system time
      back or forth to EPOCH which is the number of seconds elapsed since
@@ -6701,6 +6746,14 @@ File: gnupg.info,  Node: Esoteric Options,  Prev: CMS Options,  Up: GPGSM Option
      that they are included anyway if the key specification for a
      listing is given as fingerprint or keygrip.
 
+'--compatibility-flags FLAGS'
+     Set compatibility flags to work around problems due to
+     non-compliant certificates or data.  The FLAGS are given as a comma
+     separated list of flag names and are OR-ed together.  The special
+     flag "none" clears the list and allows to start over with an empty
+     list.  To get a list of available flags the sole word "help" can be
+     used.
+
 '--debug-level LEVEL'
      Select the debug level for investigating problems.  LEVEL may be a
      numeric value or by a keyword:
diff --git a/doc/gnupg.info-2 b/doc/gnupg.info-2
index 766cc37..ac111fd 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.2.33-beta28,
-November 2021).
+This is the 'The GNU Privacy Guard Manual' (version 2.2.37-beta27,
+August 2022).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -654,10 +654,11 @@ File: gnupg.info,  Node: Scdaemon Options,  Next: Card applications,  Prev: Scda
      this option only if you know what you are doing.
 
 '--pcsc-driver LIBRARY'
-     Use LIBRARY to access the smartcard reader.  The current default is
-     'libpcsclite.so'.  Instead of using this option you might also want
-     to install a symbolic link to the default file name (e.g.  from
-     'libpcsclite.so.1').
+     Use LIBRARY to access the smartcard reader.  The current default on
+     Unix is 'libpcsclite.so' and on Windows 'winscard.dll'.  Instead of
+     using this option you might also want to install a symbolic link to
+     the default file name (e.g.  from 'libpcsclite.so.1').  A Unicode
+     file name may not be used on Windows.
 
 '--ctapi-driver LIBRARY'
      Use LIBRARY to access the smartcard reader.  The current default is
@@ -1640,9 +1641,12 @@ One of the following commands must be given:
 
 '--apply-defaults'
      Update all configuration files with values taken from the global
-     configuration file (usually '/etc/gnupg/gpgconf.conf').
+     configuration file (usually '/etc/gnupg/gpgconf.conf').  Note: This
+     is a legacy mechanism.  Please use global configuraion files
+     instead.
 
 '--list-dirs [NAMES]'
+'-L'
      Lists the directories used by 'gpgconf'.  One directory is listed
      per line, and each line consists of a colon-separated list where
      the first field names the directory type (for example 'sysconfdir')
@@ -1674,6 +1678,7 @@ One of the following commands must be given:
                  gpg-connect-agent --dirmngr 'loadswdb --force' /bye
 
 '--reload [COMPONENT]'
+'-R'
      Reload all or the given component.  This is basically the same as
      sending a SIGHUP to the component.  Components which don't support
      reloading are ignored.  Without COMPONENT or by using "all" for
@@ -1688,6 +1693,7 @@ One of the following commands must be given:
      launches all components which are daemons.
 
 '--kill [COMPONENT]'
+'-K'
      Kill the given component that runs as a daemon, including
      'gpg-agent', 'dirmngr', and 'scdaemon'.  A 'component' which does
      not run as a daemon will be ignored.  Using "all" for COMPONENT
@@ -2250,9 +2256,14 @@ File: gnupg.info,  Node: Listing global options,  Next: Querying versions,  Prev
 9.4.7 Listing global options
 ----------------------------
 
-Sometimes it is useful for applications to look at the global options
-file 'gpgconf.conf'.  The colon separated listing format is record
-oriented and uses the first field to identify the record type:
+Some legacy applications look at the global configuration file for the
+gpgconf tool itself; this is the file 'gpgconf.conf'.  Modern
+applications should not use it but use per component global
+configuration files which are more flexible than the 'gpgconf.conf'.
+Using both files is not suggested.
+
+   The colon separated listing format is record oriented and uses the
+first field to identify the record type:
 
 'k'
      This describes a key record to start the definition of a new
@@ -2379,8 +2390,10 @@ File: gnupg.info,  Node: Files used by gpgconf,  Prev: Querying versions,  Up: g
 
 '/etc/gnupg/gpgconf.conf'
      If this file exists, it is processed as a global configuration
-     file.  A commented example can be found in the 'examples' directory
-     of the distribution.
+     file.  This is a legacy mechanism which should not be used tigether
+     with the modern global per component configuration files.  A
+     commented example can be found in the 'examples' directory of the
+     distribution.
 
 'GNUPGHOME/swdb.lst'
      A file with current software versions.  'dirmngr' creates this file
@@ -2392,7 +2405,10 @@ File: gnupg.info,  Node: applygnupgdefaults,  Next: gpg-preset-passphrase,  Prev
 9.5 Run gpgconf for all users
 =============================
 
-This script is a wrapper around 'gpgconf' to run it with the command
+This is a legacy script.  Modern application should use the per
+component global configuration files under '/etc/gnupg/'.
+
+   This script is a wrapper around 'gpgconf' to run it with the command
 '--apply-defaults' for all real users with an existing GnuPG home
 directory.  Admins might want to use this script to update he GnuPG
 configuration files for all users after '/etc/gnupg/gpgconf.conf' has
@@ -2998,6 +3014,31 @@ using the same format as used by PGP's PGP Zip.
      be used to encrypt or sign using the CMS protocol; but that is not
      yet implemented.
 
+'--batch'
+     Use batch mode.  Never ask but use the default action.  This option
+     is passed directly to 'gpg'.
+
+'--yes'
+     Assume "yes" on most questions.  Often used together with '--batch'
+     to overwrite existing files.  This option is passed directly to
+     'gpg'.
+
+'--no'
+     Assume "no" on most questions.  This option is passed directly to
+     'gpg'.
+
+'--require-compliance'
+     This option is passed directly to 'gpg'.
+
+'--status-fd N'
+     Write special status strings to the file descriptor N.  See the
+     file DETAILS in the documentation for a listing of them.
+
+'--with-log'
+     When extracting an encrypted tarball also write a log file with the
+     gpg output to a file named after the extraction directory with the
+     suffix ".log".
+
 '--set-filename FILE'
      Use the last component of FILE as the output directory.  The
      default is to take the directory name from the input filename.  If
@@ -4811,20 +4852,20 @@ Option Index
 * agent-program:                         GPG Configuration Options.
                                                               (line 755)
 * agent-program <1>:                     Configuration Options.
-                                                              (line  55)
+                                                              (line  53)
 * agent-program <2>:                     Invoking gpg-connect-agent.
                                                               (line  42)
-* allow-admin:                           Scdaemon Options.    (line 203)
-* allow-emacs-pinentry:                  Agent Options.       (line 195)
+* allow-admin:                           Scdaemon Options.    (line 204)
+* allow-emacs-pinentry:                  Agent Options.       (line 206)
 * allow-freeform-uid:                    GPG Esoteric Options.
                                                               (line 367)
-* allow-loopback-pinentry:               Agent Options.       (line 177)
+* allow-loopback-pinentry:               Agent Options.       (line 188)
 * allow-multiple-messages:               GPG Esoteric Options.
                                                               (line 560)
 * allow-non-selfsigned-uid:              GPG Esoteric Options.
                                                               (line 362)
 * allow-ocsp:                            Dirmngr Options.     (line 327)
-* allow-preset-passphrase:               Agent Options.       (line 172)
+* allow-preset-passphrase:               Agent Options.       (line 183)
 * allow-secret-key-import:               GPG Esoteric Options.
                                                               (line 556)
 * allow-version-check:                   Dirmngr Options.     (line 138)
@@ -4851,7 +4892,7 @@ Option Index
                                                               (line  98)
 * auto-check-trustdb:                    GPG Configuration Options.
                                                               (line 742)
-* auto-expand-secmem:                    Agent Options.       (line 445)
+* auto-expand-secmem:                    Agent Options.       (line 456)
 * auto-issuer-key-retrieve:              Certificate Options. (line  62)
 * auto-key-import:                       GPG Configuration Options.
                                                               (line 578)
@@ -4863,6 +4904,7 @@ Option Index
 * batch:                                 Agent Options.       (line  48)
 * batch <1>:                             GPG Configuration Options.
                                                               (line  45)
+* batch <2>:                             gpgtar.              (line 104)
 * bzip2-compress-level:                  GPG Configuration Options.
                                                               (line 334)
 * bzip2-decompress-lowmem:               GPG Configuration Options.
@@ -4877,7 +4919,7 @@ Option Index
                                                               (line 210)
 * card-status:                           Operational GPG Commands.
                                                               (line 216)
-* card-timeout:                          Scdaemon Options.    (line 179)
+* card-timeout:                          Scdaemon Options.    (line 180)
 * cert-digest-algo:                      GPG Esoteric Options.
                                                               (line 238)
 * cert-notation:                         GPG Esoteric Options.
@@ -4891,12 +4933,12 @@ Option Index
 * change-pin:                            Operational GPG Commands.
                                                               (line 219)
 * check:                                 gpg-check-pattern.   (line  56)
-* check-passphrase-pattern:              Agent Options.       (line 249)
+* check-passphrase-pattern:              Agent Options.       (line 260)
 * check-signatures:                      Operational GPG Commands.
                                                               (line 140)
 * check-sigs:                            Operational GPG Commands.
                                                               (line 141)
-* check-sym-passphrase-pattern:          Agent Options.       (line 249)
+* check-sym-passphrase-pattern:          Agent Options.       (line 260)
 * check-trustdb:                         Operational GPG Commands.
                                                               (line 349)
 * cipher-algo:                           GPG Esoteric Options.
@@ -4913,6 +4955,7 @@ Option Index
                                                               (line 357)
 * comment:                               GPG Esoteric Options.
                                                               (line 103)
+* compatibility-flags:                   Esoteric Options.    (line  57)
 * compliance:                            Compliance Options.  (line  67)
 * compliance <1>:                        Esoteric Options.    (line  18)
 * compliant-needed:                      GPG Configuration Options.
@@ -4924,10 +4967,10 @@ Option Index
 * connect-quick-timeout:                 Dirmngr Options.     (line 125)
 * connect-timeout:                       Dirmngr Options.     (line 125)
 * create:                                gpgtar.              (line  16)
-* create-socketdir:                      Invoking gpgconf.    (line  91)
+* create-socketdir:                      Invoking gpgconf.    (line  96)
 * csh:                                   Agent Options.       (line 146)
 * csh <1>:                               Dirmngr Options.     (line  87)
-* ctapi-driver:                          Scdaemon Options.    (line 156)
+* ctapi-driver:                          Scdaemon Options.    (line 157)
 * daemon:                                Agent Commands.      (line  27)
 * daemon <1>:                            Dirmngr Commands.    (line  27)
 * daemon <2>:                            Scdaemon Commands.   (line  31)
@@ -4937,29 +4980,29 @@ Option Index
 * debug <1>:                             Dirmngr Options.     (line  59)
 * debug <2>:                             GPG Esoteric Options.
                                                               (line  47)
-* debug <3>:                             Esoteric Options.    (line  63)
+* debug <3>:                             Esoteric Options.    (line  90)
 * debug <4>:                             Scdaemon Options.    (line  69)
 * debug-all:                             Agent Options.       (line 106)
 * debug-all <1>:                         Dirmngr Options.     (line  66)
 * debug-all <2>:                         GPG Esoteric Options.
                                                               (line  53)
-* debug-all <3>:                         Esoteric Options.    (line  90)
+* debug-all <3>:                         Esoteric Options.    (line 117)
 * debug-all <4>:                         Scdaemon Options.    (line  96)
-* debug-allow-core-dump:                 Esoteric Options.    (line  93)
+* debug-allow-core-dump:                 Esoteric Options.    (line 120)
 * debug-allow-core-dump <1>:             Scdaemon Options.    (line 113)
 * debug-assuan-log-cats:                 Scdaemon Options.    (line 122)
 * debug-disable-ticker:                  Scdaemon Options.    (line 109)
-* debug-ignore-expiration:               Esoteric Options.    (line 104)
+* debug-ignore-expiration:               Esoteric Options.    (line 131)
 * debug-iolbf:                           GPG Esoteric Options.
                                                               (line  56)
 * debug-level:                           Agent Options.       (line  57)
 * debug-level <1>:                       Dirmngr Options.     (line  34)
 * debug-level <2>:                       GPG Esoteric Options.
                                                               (line  22)
-* debug-level <3>:                       Esoteric Options.    (line  38)
+* debug-level <3>:                       Esoteric Options.    (line  65)
 * debug-level <4>:                       Scdaemon Options.    (line  40)
 * debug-log-tid:                         Scdaemon Options.    (line 119)
-* debug-no-chain-validation:             Esoteric Options.    (line 100)
+* debug-no-chain-validation:             Esoteric Options.    (line 127)
 * debug-pinentry:                        Agent Options.       (line 126)
 * debug-quick-random:                    Agent Options.       (line 114)
 * debug-wait:                            Agent Options.       (line 109)
@@ -4975,8 +5018,8 @@ Option Index
 * decrypt <2>:                           gpgtar.              (line  29)
 * decrypt-files:                         Operational GPG Commands.
                                                               (line 114)
-* default-cache-ttl:                     Agent Options.       (line 206)
-* default-cache-ttl <1>:                 Agent Options.       (line 215)
+* default-cache-ttl:                     Agent Options.       (line 217)
+* default-cache-ttl <1>:                 Agent Options.       (line 226)
 * default-cert-expire:                   GPG Esoteric Options.
                                                               (line 527)
 * default-cert-level:                    GPG Configuration Options.
@@ -5004,7 +5047,7 @@ Option Index
                                                               (line 244)
 * delete-secret-keys:                    Operational GPG Commands.
                                                               (line 233)
-* deny-admin:                            Scdaemon Options.    (line 203)
+* deny-admin:                            Scdaemon Options.    (line 204)
 * desig-revoke:                          OpenPGP Key Management.
                                                               (line 134)
 * detach-sign:                           Operational GPG Commands.
@@ -5019,19 +5062,19 @@ Option Index
 * dirmngr-program:                       GPG Configuration Options.
                                                               (line 762)
 * dirmngr-program <1>:                   Configuration Options.
-                                                              (line  61)
+                                                              (line  59)
 * dirmngr-program <2>:                   Invoking gpg-connect-agent.
                                                               (line  49)
-* disable-application:                   Scdaemon Options.    (line 213)
-* disable-ccid:                          Scdaemon Options.    (line 161)
-* disable-check-own-socket:              Agent Options.       (line 331)
+* disable-application:                   Scdaemon Options.    (line 214)
+* disable-ccid:                          Scdaemon Options.    (line 162)
+* disable-check-own-socket:              Agent Options.       (line 342)
 * disable-check-own-socket <1>:          Dirmngr Options.     (line  79)
 * disable-cipher-algo:                   GPG Esoteric Options.
                                                               (line 246)
 * disable-crl-checks:                    Certificate Options. (line  13)
 * disable-dsa2:                          GPG Configuration Options.
                                                               (line 196)
-* disable-extended-key-format:           Agent Options.       (line 377)
+* disable-extended-key-format:           Agent Options.       (line 388)
 * disable-http:                          Dirmngr Options.     (line 217)
 * disable-ipv4:                          Dirmngr Options.     (line 211)
 * disable-ipv6:                          Dirmngr Options.     (line 211)
@@ -5040,14 +5083,14 @@ Option Index
 * disable-ldap:                          Dirmngr Options.     (line 214)
 * disable-mdc:                           OpenPGP Options.     (line  25)
 * disable-ocsp:                          Certificate Options. (line  53)
-* disable-pinpad:                        Scdaemon Options.    (line 200)
+* disable-pinpad:                        Scdaemon Options.    (line 201)
 * disable-policy-checks:                 Certificate Options. (line   8)
 * disable-pubkey-algo:                   GPG Esoteric Options.
                                                               (line 251)
-* disable-scdaemon:                      Agent Options.       (line 325)
+* disable-scdaemon:                      Agent Options.       (line 336)
 * disable-signer-uid:                    OpenPGP Options.     (line  31)
 * disable-trusted-cert-crl-check:        Certificate Options. (line  24)
-* display:                               Agent Options.       (line 349)
+* display:                               Agent Options.       (line 360)
 * display-charset:                       GPG Configuration Options.
                                                               (line 281)
 * display-charset:iso-8859-1:            GPG Configuration Options.
@@ -5089,21 +5132,21 @@ Option Index
 * enable-crl-checks:                     Certificate Options. (line  13)
 * enable-dsa2:                           GPG Configuration Options.
                                                               (line 196)
-* enable-extended-key-format:            Agent Options.       (line 377)
+* enable-extended-key-format:            Agent Options.       (line 388)
 * enable-issuer-based-crl-check:         Certificate Options. (line  45)
 * enable-large-rsa:                      GPG Configuration Options.
                                                               (line 187)
 * enable-ocsp:                           Certificate Options. (line  53)
-* enable-passphrase-history:             Agent Options.       (line 272)
-* enable-pinpad-varlen:                  Scdaemon Options.    (line 192)
+* enable-passphrase-history:             Agent Options.       (line 283)
+* enable-pinpad-varlen:                  Scdaemon Options.    (line 193)
 * enable-policy-checks:                  Certificate Options. (line   8)
 * enable-progress-filter:                GPG Esoteric Options.
                                                               (line  69)
-* enable-putty-support:                  Agent Options.       (line 391)
+* enable-putty-support:                  Agent Options.       (line 402)
 * enable-special-filenames:              GPG Esoteric Options.
                                                               (line 571)
 * enable-special-filenames <1>:          gpgv.                (line  97)
-* enable-ssh-support:                    Agent Options.       (line 391)
+* enable-ssh-support:                    Agent Options.       (line 402)
 * enable-trusted-cert-crl-check:         Certificate Options. (line  24)
 * enarmor:                               Operational GPG Commands.
                                                               (line 403)
@@ -5116,7 +5159,7 @@ Option Index
                                                               (line 111)
 * encrypt-to:                            GPG Key related Options.
                                                               (line  35)
-* enforce-passphrase-constraints:        Agent Options.       (line 233)
+* enforce-passphrase-constraints:        Agent Options.       (line 244)
 * escape-from-lines:                     GPG Esoteric Options.
                                                               (line 276)
 * exec:                                  Invoking gpg-connect-agent.
@@ -5150,12 +5193,12 @@ Option Index
 * export-ssh-key:                        Operational GPG Commands.
                                                               (line 290)
 * extra-digest-algo:                     Esoteric Options.    (line   7)
-* extra-socket:                          Agent Options.       (line 363)
+* extra-socket:                          Agent Options.       (line 374)
 * extract:                               gpgtar.              (line  19)
 * faked-system-time:                     Agent Options.       (line  52)
 * faked-system-time <1>:                 GPG Esoteric Options.
                                                               (line  60)
-* faked-system-time <2>:                 Esoteric Options.    (line  27)
+* faked-system-time <2>:                 Esoteric Options.    (line  46)
 * fast-list-mode:                        GPG Esoteric Options.
                                                               (line 462)
 * fetch-crl:                             Dirmngr Commands.    (line  52)
@@ -5203,10 +5246,10 @@ Option Index
 * generate-revocation:                   OpenPGP Key Management.
                                                               (line 119)
 * gnupg:                                 Compliance Options.  (line  12)
-* gpg:                                   gpgtar.              (line 110)
+* gpg:                                   gpgtar.              (line 135)
 * gpg-agent-info:                        GPG Configuration Options.
                                                               (line 752)
-* gpg-args:                              gpgtar.              (line 113)
+* gpg-args:                              gpgtar.              (line 138)
 * gpgconf-list:                          GPG Esoteric Options.
                                                               (line 605)
 * gpgconf-test:                          GPG Esoteric Options.
@@ -5224,7 +5267,7 @@ Option Index
 * help <4>:                              Scdaemon Commands.   (line  14)
 * help <5>:                              watchgnupg.          (line  39)
 * help <6>:                              dirmngr-client.      (line  44)
-* help <7>:                              gpgtar.              (line 125)
+* help <7>:                              gpgtar.              (line 150)
 * help <8>:                              gpg-wks-client.      (line 128)
 * help <9>:                              gpg-wks-server.      (line  87)
 * hex:                                   Invoking gpg-connect-agent.
@@ -5242,15 +5285,16 @@ Option Index
                                                               (line  16)
 * homedir <3>:                           Scdaemon Options.    (line  13)
 * homedir <4>:                           gpgv.                (line  69)
-* homedir <5>:                           Invoking gpgconf.    (line 115)
+* homedir <5>:                           Invoking gpgconf.    (line 120)
 * homedir <6>:                           Invoking gpg-connect-agent.
                                                               (line  21)
 * honor-http-proxy:                      Dirmngr Options.     (line 236)
 * http-proxy:                            Dirmngr Options.     (line 240)
-* ignore-cache-for-signing:              Agent Options.       (line 200)
+* ignore-cache-for-signing:              Agent Options.       (line 211)
 * ignore-cert:                           Dirmngr Options.     (line 386)
 * ignore-cert-extension:                 Dirmngr Options.     (line 376)
 * ignore-cert-extension <1>:             Certificate Options. (line  82)
+* ignore-cert-with-oid:                  Esoteric Options.    (line  37)
 * ignore-crc-error:                      GPG Esoteric Options.
                                                               (line 387)
 * ignore-http-dp:                        Dirmngr Options.     (line 220)
@@ -5279,8 +5323,8 @@ Option Index
                                                               (line  29)
 * interactive:                           GPG Esoteric Options.
                                                               (line  19)
-* keep-display:                          Agent Options.       (line 354)
-* keep-tty:                              Agent Options.       (line 354)
+* keep-display:                          Agent Options.       (line 365)
+* keep-tty:                              Agent Options.       (line 365)
 * key-origin:                            GPG Input and Output.
                                                               (line  37)
 * keydb-clear-some-cert-flags:           Certificate Management.
@@ -5372,19 +5416,17 @@ Option Index
 * keyserver <1>:                         GPG Configuration Options.
                                                               (line 636)
 * keyserver <2>:                         Configuration Options.
-                                                              (line  44)
+                                                              (line  43)
 * keyserver-options:                     GPG Configuration Options.
                                                               (line 655)
-* kill:                                  Invoking gpgconf.    (line  84)
+* kill:                                  Invoking gpgconf.    (line  89)
 * known-notation:                        GPG Esoteric Options.
                                                               (line 151)
-* launch:                                Invoking gpgconf.    (line  76)
-* lc-ctype:                              Agent Options.       (line 349)
-* lc-messages:                           Agent Options.       (line 349)
+* launch:                                Invoking gpgconf.    (line  80)
+* lc-ctype:                              Agent Options.       (line 360)
+* lc-messages:                           Agent Options.       (line 360)
 * 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.
@@ -5449,7 +5491,7 @@ Option Index
                                                               (line 450)
 * list-sigs:                             GPG Esoteric Options.
                                                               (line 451)
-* listen-backlog:                        Agent Options.       (line 359)
+* listen-backlog:                        Agent Options.       (line 370)
 * listen-backlog <1>:                    Dirmngr Options.     (line 134)
 * listen-backlog <2>:                    Scdaemon Options.    (line 135)
 * load-crl:                              Dirmngr Commands.    (line  44)
@@ -5473,7 +5515,7 @@ Option Index
 * log-file <2>:                          GPG Esoteric Options.
                                                               (line  86)
 * log-file <3>:                          Configuration Options.
-                                                              (line  82)
+                                                              (line  80)
 * log-file <4>:                          Scdaemon Options.    (line 140)
 * log-file <5>:                          gpgv.                (line  59)
 * logger-fd:                             GPG Esoteric Options.
@@ -5486,18 +5528,18 @@ Option Index
                                                               (line 352)
 * marginals-needed:                      GPG Configuration Options.
                                                               (line 721)
-* max-cache-ttl:                         Agent Options.       (line 221)
-* max-cache-ttl-ssh:                     Agent Options.       (line 227)
+* max-cache-ttl:                         Agent Options.       (line 232)
+* max-cache-ttl-ssh:                     Agent Options.       (line 238)
 * max-cert-depth:                        GPG Configuration Options.
                                                               (line 729)
 * max-output:                            GPG Input and Output.
                                                               (line  19)
-* max-passphrase-days:                   Agent Options.       (line 267)
+* max-passphrase-days:                   Agent Options.       (line 278)
 * max-replies:                           Dirmngr Options.     (line 373)
 * min-cert-level:                        GPG Configuration Options.
                                                               (line 397)
-* min-passphrase-len:                    Agent Options.       (line 237)
-* min-passphrase-nonalpha:               Agent Options.       (line 242)
+* min-passphrase-len:                    Agent Options.       (line 248)
+* min-passphrase-nonalpha:               Agent Options.       (line 253)
 * min-rsa-length:                        Compliance Options.  (line  72)
 * min-rsa-length <1>:                    Esoteric Options.    (line  22)
 * multi-server:                          Scdaemon Commands.   (line  26)
@@ -5506,8 +5548,9 @@ Option Index
 * nameserver:                            Dirmngr Options.     (line 203)
 * no:                                    GPG Configuration Options.
                                                               (line  67)
-* no-allow-external-cache:               Agent Options.       (line 185)
-* no-allow-loopback-pinentry:            Agent Options.       (line 177)
+* no <1>:                                gpgtar.              (line 113)
+* no-allow-external-cache:               Agent Options.       (line 196)
+* no-allow-loopback-pinentry:            Agent Options.       (line 188)
 * no-allow-mark-trusted:                 Agent Options.       (line 167)
 * no-armor:                              GPG Input and Output.
                                                               (line  12)
@@ -5518,12 +5561,12 @@ Option Index
 * no-autostart:                          GPG Configuration Options.
                                                               (line 769)
 * no-autostart <1>:                      Configuration Options.
-                                                              (line  71)
+                                                              (line  69)
 * no-autostart <2>:                      Invoking gpg-connect-agent.
                                                               (line  77)
 * no-batch:                              GPG Configuration Options.
                                                               (line  45)
-* no-common-certs-import:                Esoteric Options.    (line 141)
+* no-common-certs-import:                Esoteric Options.    (line 168)
 * no-default-keyring:                    GPG Esoteric Options.
                                                               (line 432)
 * no-default-recipient:                  GPG Configuration Options.
@@ -5554,7 +5597,7 @@ Option Index
 * no-secmem-warning:                     GPG Configuration Options.
                                                               (line 817)
 * no-secmem-warning <1>:                 Configuration Options.
-                                                              (line  78)
+                                                              (line  76)
 * no-sig-cache:                          GPG Configuration Options.
                                                               (line 732)
 * no-skip-hidden-recipients:             GPG Key related Options.
@@ -5563,8 +5606,9 @@ Option Index
                                                               (line 337)
 * no-tty:                                GPG Configuration Options.
                                                               (line  58)
-* no-use-standard-socket:                Agent Options.       (line 339)
+* no-use-standard-socket:                Agent Options.       (line 350)
 * no-use-tor:                            Dirmngr Options.     (line  98)
+* no-user-trustlist:                     Agent Options.       (line 172)
 * no-verbose:                            GPG Configuration Options.
                                                               (line  37)
 * not-dash-escaped:                      GPG Esoteric Options.
@@ -5604,7 +5648,7 @@ Option Index
                                                               (line  36)
 * passphrase-fd:                         GPG Esoteric Options.
                                                               (line 291)
-* passphrase-fd <1>:                     Esoteric Options.    (line 109)
+* passphrase-fd <1>:                     Esoteric Options.    (line 136)
 * passphrase-file:                       GPG Esoteric Options.
                                                               (line 301)
 * passphrase-repeat:                     GPG Esoteric Options.
@@ -5626,19 +5670,19 @@ Option Index
 * pgp8:                                  Compliance Options.  (line  60)
 * photo-viewer:                          GPG Configuration Options.
                                                               (line 202)
-* pinentry-formatted-passphrase:         Agent Options.       (line 286)
-* pinentry-invisible-char:               Agent Options.       (line 275)
+* pinentry-formatted-passphrase:         Agent Options.       (line 297)
+* pinentry-invisible-char:               Agent Options.       (line 286)
 * pinentry-mode:                         GPG Esoteric Options.
                                                               (line 322)
-* pinentry-mode <1>:                     Esoteric Options.    (line 118)
-* pinentry-program:                      Agent Options.       (line 299)
-* pinentry-timeout:                      Agent Options.       (line 280)
-* pinentry-touch-file:                   Agent Options.       (line 312)
+* pinentry-mode <1>:                     Esoteric Options.    (line 145)
+* pinentry-program:                      Agent Options.       (line 310)
+* pinentry-timeout:                      Agent Options.       (line 291)
+* pinentry-touch-file:                   Agent Options.       (line 323)
 * ping:                                  dirmngr-client.      (line  69)
 * policy-file:                           Configuration Options.
-                                                              (line  52)
+                                                              (line  50)
 * prefer-system-dirmngr:                 Configuration Options.
-                                                              (line  65)
+                                                              (line  63)
 * preserve-permissions:                  GPG Esoteric Options.
                                                               (line 579)
 * preset:                                Invoking gpg-preset-passphrase.
@@ -5673,7 +5717,7 @@ Option Index
 * quiet <1>:                             GPG Configuration Options.
                                                               (line  40)
 * quiet <2>:                             gpgv.                (line  35)
-* quiet <3>:                             Invoking gpgconf.    (line 112)
+* quiet <3>:                             Invoking gpgconf.    (line 117)
 * quiet <4>:                             Invoking gpg-connect-agent.
                                                               (line  18)
 * quiet <5>:                             dirmngr-client.      (line  48)
@@ -5682,7 +5726,7 @@ Option Index
 * quiet <8>:                             gpg-wks-server.      (line  81)
 * raw-socket:                            Invoking gpg-connect-agent.
                                                               (line  59)
-* reader-port:                           Scdaemon Options.    (line 167)
+* reader-port:                           Scdaemon Options.    (line 168)
 * rebuild-keydb-caches:                  Operational GPG Commands.
                                                               (line 380)
 * receive-keys:                          Operational GPG Commands.
@@ -5698,11 +5742,14 @@ Option Index
                                                               (line 314)
 * refresh-keys:                          Operational GPG Commands.
                                                               (line 317)
-* reload:                                Invoking gpgconf.    (line  70)
-* remove-socketdir:                      Invoking gpgconf.    (line  97)
+* reload:                                Invoking gpgconf.    (line  74)
+* remove-socketdir:                      Invoking gpgconf.    (line 102)
 * request-origin:                        GPG Esoteric Options.
                                                               (line 342)
-* request-origin <1>:                    Esoteric Options.    (line 133)
+* request-origin <1>:                    Esoteric Options.    (line 160)
+* require-compliance:                    Compliance Options.  (line  77)
+* require-compliance <1>:                Esoteric Options.    (line  27)
+* require-compliance <2>:                gpgtar.              (line 117)
 * require-cross-certification:           GPG Configuration Options.
                                                               (line 839)
 * require-secmem:                        GPG Configuration Options.
@@ -5714,13 +5761,13 @@ Option Index
 * run:                                   Invoking gpg-connect-agent.
                                                               (line  82)
 * s:                                     Dirmngr Options.     (line  87)
-* s2k-calibration:                       Agent Options.       (line 454)
+* s2k-calibration:                       Agent Options.       (line 465)
 * s2k-cipher-algo:                       OpenPGP Options.     (line  74)
-* s2k-count:                             Agent Options.       (line 461)
+* s2k-count:                             Agent Options.       (line 472)
 * s2k-count <1>:                         OpenPGP Options.     (line  90)
 * s2k-digest-algo:                       OpenPGP Options.     (line  79)
 * s2k-mode:                              OpenPGP Options.     (line  83)
-* scdaemon-program:                      Agent Options.       (line 321)
+* scdaemon-program:                      Agent Options.       (line 332)
 * search-keys:                           Operational GPG Commands.
                                                               (line 323)
 * secret-keyring:                        GPG Configuration Options.
@@ -5738,7 +5785,7 @@ Option Index
 * server <3>:                            Scdaemon Commands.   (line  22)
 * set-filename:                          GPG Esoteric Options.
                                                               (line 178)
-* set-filename <1>:                      gpgtar.              (line 104)
+* set-filename <1>:                      gpgtar.              (line 129)
 * set-filesize:                          GPG Esoteric Options.
                                                               (line 474)
 * set-notation:                          GPG Esoteric Options.
@@ -5774,13 +5821,14 @@ Option Index
 * skip-verify:                           GPG Esoteric Options.
                                                               (line 442)
 * squid-mode:                            dirmngr-client.      (line 101)
-* ssh-fingerprint-digest:                Agent Options.       (line 439)
+* ssh-fingerprint-digest:                Agent Options.       (line 450)
 * standard-resolver:                     Dirmngr Options.     (line 110)
 * status-fd:                             GPG Esoteric Options.
                                                               (line  74)
 * status-fd <1>:                         gpgv.                (line  52)
-* status-fd <2>:                         Invoking gpgconf.    (line 153)
-* status-fd <3>:                         gpg-wks-client.      (line 108)
+* status-fd <2>:                         Invoking gpgconf.    (line 158)
+* status-fd <3>:                         gpgtar.              (line 120)
+* status-fd <4>:                         gpg-wks-client.      (line 108)
 * status-file:                           GPG Esoteric Options.
                                                               (line  78)
 * steal-socket:                          Agent Options.       (line 135)
@@ -5792,7 +5840,8 @@ Option Index
 * supervised <1>:                        Dirmngr Commands.    (line  33)
 * symmetric:                             Operational GPG Commands.
                                                               (line  42)
-* tar-args:                              gpgtar.              (line 116)
+* sys-trustlist-name:                    Agent Options.       (line 177)
+* tar-args:                              gpgtar.              (line 141)
 * textmode:                              OpenPGP Options.     (line   8)
 * throw-keyids:                          GPG Esoteric Options.
                                                               (line 257)
@@ -5826,8 +5875,8 @@ Option Index
                                                               (line 100)
 * try-secret-key:                        GPG Key related Options.
                                                               (line  89)
-* ttyname:                               Agent Options.       (line 349)
-* ttytype:                               Agent Options.       (line 349)
+* ttyname:                               Agent Options.       (line 360)
+* ttytype:                               Agent Options.       (line 360)
 * ungroup:                               GPG Key related Options.
                                                               (line  70)
 * update-trustdb:                        Operational GPG Commands.
@@ -5838,8 +5887,8 @@ Option Index
                                                               (line 749)
 * use-embedded-filename:                 GPG Esoteric Options.
                                                               (line 194)
-* use-standard-socket:                   Agent Options.       (line 339)
-* use-standard-socket-p:                 Agent Options.       (line 339)
+* use-standard-socket:                   Agent Options.       (line 350)
+* use-standard-socket-p:                 Agent Options.       (line 350)
 * use-tor:                               Dirmngr Options.     (line  98)
 * utf8-strings:                          GPG Configuration Options.
                                                               (line 308)
@@ -5908,7 +5957,7 @@ Option Index
 * version <4>:                           Scdaemon Commands.   (line  10)
 * version <5>:                           watchgnupg.          (line  36)
 * version <6>:                           dirmngr-client.      (line  40)
-* version <7>:                           gpgtar.              (line 122)
+* version <7>:                           gpgtar.              (line 147)
 * version <8>:                           gpg-wks-client.      (line 125)
 * version <9>:                           gpg-wks-server.      (line  84)
 * warranty:                              General GPG Commands.
@@ -5922,7 +5971,7 @@ Option Index
                                                               (line 276)
 * with-colons <1>:                       gpg-wks-client.      (line  69)
 * with-dir:                              gpg-wks-server.      (line  69)
-* with-ephemeral-keys:                   Esoteric Options.    (line  33)
+* with-ephemeral-keys:                   Esoteric Options.    (line  52)
 * with-file:                             gpg-wks-server.      (line  73)
 * with-fingerprint:                      GPG Input and Output.
                                                               (line 296)
@@ -5935,6 +5984,7 @@ Option Index
                                                               (line 315)
 * with-keygrip:                          GPG Input and Output.
                                                               (line 311)
+* with-log:                              gpgtar.              (line 124)
 * with-secret:                           GPG Input and Output.
                                                               (line 326)
 * with-secret <1>:                       Input and Output.    (line  78)
@@ -5943,9 +5993,10 @@ Option Index
 * with-validation:                       Input and Output.    (line  60)
 * with-wkd-hash:                         GPG Input and Output.
                                                               (line 321)
-* xauthority:                            Agent Options.       (line 349)
+* xauthority:                            Agent Options.       (line 360)
 * yes:                                   GPG Configuration Options.
                                                               (line  63)
+* yes <1>:                               gpgtar.              (line 108)
 
 
 File: gnupg.info,  Node: Environment Index,  Next: Index,  Prev: Option Index,  Up: Top
@@ -5972,10 +6023,11 @@ Environment Variable and File Index
                                                               (line  16)
 * GNUPGHOME <4>:                         Scdaemon Options.    (line  13)
 * GNUPGHOME <5>:                         gpgv.                (line  69)
-* GNUPGHOME <6>:                         Invoking gpgconf.    (line 115)
+* GNUPGHOME <6>:                         Invoking gpgconf.    (line 120)
 * GNUPGHOME <7>:                         Invoking gpg-connect-agent.
                                                               (line  21)
 * GNUPG_BUILD_ROOT:                      GPG Configuration.   (line 130)
+* GNUPG_EXEC_DEBUG_FLAGS:                GPG Configuration.   (line 135)
 * gpg-agent.conf:                        Agent Configuration. (line  11)
 * gpg.conf:                              GPG Configuration.   (line  11)
 * gpgconf.ctl:                           Agent Options.       (line  28)
@@ -5985,7 +6037,7 @@ Environment Variable and File Index
                                                               (line  27)
 * gpgconf.ctl <3>:                       Scdaemon Options.    (line  24)
 * gpgconf.ctl <4>:                       gpgv.                (line  80)
-* gpgconf.ctl <5>:                       Invoking gpgconf.    (line 126)
+* gpgconf.ctl <5>:                       Invoking gpgconf.    (line 131)
 * gpgconf.ctl <6>:                       Invoking gpg-connect-agent.
                                                               (line  32)
 * gpgsm.conf:                            GPGSM Configuration. (line  11)
@@ -6000,7 +6052,7 @@ Environment Variable and File Index
                                                               (line  16)
 * HKCU\Software\GNU\GnuPG:HomeDir <3>:   Scdaemon Options.    (line  13)
 * HKCU\Software\GNU\GnuPG:HomeDir <4>:   gpgv.                (line  69)
-* HKCU\Software\GNU\GnuPG:HomeDir <5>:   Invoking gpgconf.    (line 115)
+* HKCU\Software\GNU\GnuPG:HomeDir <5>:   Invoking gpgconf.    (line 120)
 * HKCU\Software\GNU\GnuPG:HomeDir <6>:   Invoking gpg-connect-agent.
                                                               (line  21)
 * HOME:                                  GPG Configuration.   (line 103)
@@ -6015,7 +6067,7 @@ Environment Variable and File Index
 * PINENTRY_USER_DATA:                    GPG Configuration.   (line 113)
 * PINENTRY_USER_DATA <1>:                GPGSM OPTION.        (line  33)
 * policies.txt:                          GPGSM Configuration. (line  18)
-* private-keys-v1.d:                     Agent Configuration. (line 104)
+* private-keys-v1.d:                     Agent Configuration. (line 106)
 * pubring.gpg:                           GPG Configuration.   (line  32)
 * pubring.kbx:                           GPG Configuration.   (line  50)
 * pubring.kbx <1>:                       GPGSM Configuration. (line 100)
@@ -6025,7 +6077,7 @@ Environment Variable and File Index
 * S.gpg-agent:                           GPGSM Configuration. (line 111)
 * secring.gpg:                           GPG Configuration.   (line  69)
 * SHELL:                                 Agent Options.       (line 146)
-* sshcontrol:                            Agent Configuration. (line  74)
+* sshcontrol:                            Agent Configuration. (line  76)
 * TERM:                                  GPGSM OPTION.        (line  25)
 * trustdb.gpg:                           GPG Configuration.   (line  80)
 * trustlist.txt:                         Agent Configuration. (line  20)
@@ -6057,7 +6109,7 @@ Index
 * options, GPG-AGENT command:            Invoking GPG-AGENT.   (line  6)
 * options, GPGSM command:                Invoking GPGSM.       (line  6)
 * options, SCDAEMON command:             Invoking SCDAEMON.    (line  6)
-* relax:                                 Agent Configuration.  (line 62)
+* relax:                                 Agent Configuration.  (line 64)
 * scd-event:                             Scdaemon Configuration.
                                                                (line 18)
 * SCDAEMON command options:              Invoking SCDAEMON.    (line  6)
@@ -6073,6 +6125,6 @@ Index
 * SIGUSR1 <1>:                           Dirmngr Signals.      (line 29)
 * SIGUSR2:                               Agent Signals.        (line 37)
 * swdb.lst:                              Files used by gpgconf.
-                                                               (line 12)
+                                                               (line 14)
 * trust values:                          Trust Values.         (line  6)
 
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 2fa80f4..8766250 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -366,6 +366,21 @@ Do not allow clients to mark keys as trusted, i.e. put them into the
 @file{trustlist.txt} file.  This makes it harder for users to inadvertently
 accept Root-CA keys.
 
+
+@anchor{option --no-user-trustlist}
+@item --no-user-trustlist
+@opindex no-user-trustlist
+Entirely ignore the user trust list and consider only the global
+trustlist (@file{@value{SYSCONFDIR}/trustlist.txt}).  This
+implies the @ref{option --no-allow-mark-trusted}.
+
+@item --sys-trustlist-name @var{file}
+@opindex sys-trustlist-name
+Changes the default name for the global trustlist from "trustlist.txt"
+to @var{file}.  If @var{file} does not contain any slashes and does
+not start with "~/" it is searched in the system configuration
+directory (@file{@value{SYSCONFDIR}}).
+
 @anchor{option --allow-preset-passphrase}
 @item --allow-preset-passphrase
 @opindex allow-preset-passphrase
@@ -794,7 +809,9 @@ that this file can't be changed inadvertently.
 
 As a special feature a line @code{include-default} will include a global
 list of trusted certificates (e.g. @file{@value{SYSCONFDIR}/trustlist.txt}).
-This global list is also used if the local list is not available.
+This global list is also used if the local list is not available;
+the @ref{option --no-user-trustlist} enforces the use of only
+this global list.
 
 It is possible to add further flags after the @code{S} for use by the
 caller:
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 3399e24..39c996b 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2889,6 +2889,17 @@ This option adjusts the compliance mode "de-vs" for stricter key size
 requirements.  For example, a value of 3000 turns rsa2048 and dsa2048
 keys into non-VS-NfD compliant keys.
 
+@item --require-compliance
+@opindex require-compliance
+To check that data has been encrypted according to the rules of the
+current compliance mode, a gpg user needs to evaluate the status
+lines.  This is allows frontends to handle compliance check in a more
+flexible way.  However, for scripted use the required evaluation of
+the status-line requires quite some effort; this option can be used
+instead to make sure that the gpg process exits with a failure if the
+compliance rules are not fulfilled.  Note that this option has
+currently an effect only in "de-vs" mode.
+
 @end table
 
 
@@ -3807,6 +3818,12 @@ Operation is further controlled by a few environment variables:
   under operating systems without proper support to figure out the
   name of a process' text file.
 
+  @item GNUPG_EXEC_DEBUG_FLAGS
+  @efindex GNUPG_EXEC_DEBUG_FLAGS
+  This variable allows to enable diagnostics for process management.
+  A numeric decimal value is expected.  Bit 0 enables general
+  diagnostics, bit 1 enables certain warnings on Windows.
+
 @end table
 
 When calling the gpg-agent component @command{@gpgname} sends a set of
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index d3d83e4..ba91aed 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -347,16 +347,14 @@ Outputs additional information while running.
 You can increase the verbosity by giving several
 verbose commands to @command{gpgsm}, such as @samp{-vv}.
 
-@item --ldapserver @var{string}
-@itemx --keyserver @var{string}
-@opindex ldapserver
+@item --keyserver @var{string}
 @opindex keyserver
-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.
+This is a deprecated option.  It was used to add an LDAP server to use
+for X.509 certificate and CRL lookup.  The alias @option{--ldapserver}
+existed from version 2.2.28 to 2.2.33 but is now entirely ignored.
+
+LDAP servers must be given in the configuration for @command{dirmngr}.
+
 
 @item --policy-file @var{filename}
 @opindex policy-file
@@ -678,6 +676,27 @@ This option adjusts the compliance mode "de-vs" for stricter key size
 requirements.  For example, a value of 3000 turns rsa2048 and dsa2048
 keys into non-VS-NfD compliant keys.
 
+@item --require-compliance
+@opindex require-compliance
+To check that data has been encrypted according to the rules of the
+current compliance mode, a gpgsm user needs to evaluate the status
+lines.  This is allows frontends to handle compliance check in a more
+flexible way.  However, for scripted use the required evaluation of
+the status-line requires quite some effort; this option can be used
+instead to make sure that the gpgsm process exits with a failure if
+the compliance rules are not fulfilled.  Note that this option has
+currently an effect only in "de-vs" mode.
+
+@item --ignore-cert-with-oid @var{oid}
+@opindex ignore-cert-with-oid
+Add @var{oid} to the list of OIDs to be checked while reading
+certificates from smartcards. The @var{oid} is expected to be in
+dotted decimal form, like @code{2.5.29.3}.  This option may be used
+more than once.  As of now certificates with an extended key usage
+matching one of those OIDs are ignored during a @option{--learn-card}
+operation and not imported.  This option can help to keep the local
+key database clear of unneeded certificates stored on smartcards.
+
 @item --faked-system-time @var{epoch}
 @opindex faked-system-time
 This option is only useful for testing; it sets the system time back or
@@ -691,6 +710,14 @@ Include ephemeral flagged keys in the output of key listings.  Note
 that they are included anyway if the key specification for a listing
 is given as fingerprint or keygrip.
 
+@item --compatibility-flags @var{flags}
+@opindex compatibility-flags
+Set compatibility flags to work around problems due to non-compliant
+certificates or data.  The @var{flags} are given as a comma separated
+list of flag names and are OR-ed together.  The special flag "none"
+clears the list and allows to start over with an empty list.  To get a
+list of available flags the sole word "help" can be used.
+
 @item --debug-level @var{level}
 @opindex debug-level
 Select the debug level for investigating problems. @var{level} may be
diff --git a/doc/help.txt b/doc/help.txt
index 38f25cd..a172176 100644
--- a/doc/help.txt
+++ b/doc/help.txt
@@ -134,6 +134,15 @@ Please consult your security expert first.
 .
 
 
+
+.gpg.keygen.keygrip
+Enter the keygrip of the key to add.
+
+The keygrip is a string of 40 hex digits that identifies a key.  It
+must belong to a secret key or a secret subkey stored in your keyring.
+.
+
+
 .gpg.keygen.flags
 Toggle the capabilities of the key.
 
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 1271994..98fa70c 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -258,9 +258,10 @@ this option only if you know what you are doing.
 @item --pcsc-driver @var{library}
 @opindex pcsc-driver
 Use @var{library} to access the smartcard reader.  The current default
-is @file{libpcsclite.so}.  Instead of using this option you might also
-want to install a symbolic link to the default file name
-(e.g. from @file{libpcsclite.so.1}).
+on Unix is @file{libpcsclite.so} and on Windows @file{winscard.dll}.
+Instead of using this option you might also want to install a symbolic
+link to the default file name (e.g. from @file{libpcsclite.so.1}).
+A Unicode file name may not be used on Windows.
 
 @item --ctapi-driver @var{library}
 @opindex ctapi-driver
diff --git a/doc/tools.texi b/doc/tools.texi
index 2e64ba7..6b9a9fe 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -298,8 +298,11 @@ shall go into the respective configuration file.
 @item --apply-defaults
 Update all configuration files with values taken from the global
 configuration file (usually @file{/etc/gnupg/gpgconf.conf}).
+Note: This is a legacy mechanism.  Please use global configuraion
+files instead.
 
 @item --list-dirs [@var{names}]
+@itemx -L
 Lists the directories used by @command{gpgconf}.  One directory is
 listed per line, and each line consists of a colon-separated list where
 the first field names the directory type (for example @code{sysconfdir})
@@ -333,8 +336,8 @@ force an update of that file this command can be used:
        gpg-connect-agent --dirmngr 'loadswdb --force' /bye
 @end example
 
-
 @item --reload [@var{component}]
+@itemx -R
 @opindex reload
 Reload all or the given component. This is basically the same as
 sending a SIGHUP to the component.  Components which don't support
@@ -351,6 +354,7 @@ may use this command to ensure that they are started.  Using "all" for
 @var{component} launches all components which are daemons.
 
 @item --kill [@var{component}]
+@itemx -K
 @opindex kill
 Kill the given component that runs as a daemon, including
 @command{gpg-agent}, @command{dirmngr}, and @command{scdaemon}.  A
@@ -950,8 +954,12 @@ effect.
 @node Listing global options
 @subsection Listing global options
 
-Sometimes it is useful for applications to look at the global options
-file @file{gpgconf.conf}.
+Some legacy applications look at the global configuration file for the
+gpgconf tool itself; this is the file @file{gpgconf.conf}.  Modern
+applications should not use it but use per component global
+configuration files which are more flexible than the
+@file{gpgconf.conf}.  Using both files is not suggested.
+
 The colon separated listing format is record oriented and uses the first
 field to identify the record type:
 
@@ -1092,8 +1100,10 @@ More fields may be added in future to the output.
 @item /etc/gnupg/gpgconf.conf
 @cindex gpgconf.conf
   If this file exists, it is processed as a global configuration file.
-  A commented example can be found in the @file{examples} directory of
-  the distribution.
+  This is a legacy mechanism which should not be used tigether with
+  the modern global per component configuration files.  A commented
+  example can be found in the @file{examples} directory of the
+  distribution.
 
 @item @var{GNUPGHOME}/swdb.lst
 @cindex swdb.lst
@@ -1132,6 +1142,9 @@ More fields may be added in future to the output.
 @end ifset
 
 @mansect description
+This is a legacy script.  Modern application should use the per
+component global configuration files under @file{/etc/gnupg/}.
+
 This script is a wrapper around @command{gpgconf} to run it with the
 command @code{--apply-defaults} for all real users with an existing
 GnuPG home directory.  Admins might want to use this script to update he
@@ -1933,6 +1946,36 @@ This option is reserved and shall not be used.  It will eventually be
 used to encrypt or sign using the CMS protocol; but that is not yet
 implemented.
 
+@item --batch
+@opindex batch
+Use batch mode.  Never ask but use the default action.  This option is
+passed directly to @command{gpg}.
+
+@item --yes
+@opindex yes
+Assume "yes" on most questions.  Often used together with
+@option{--batch} to overwrite existing files.  This option is passed
+directly to @command{gpg}.
+
+@item --no
+@opindex no
+Assume "no" on most questions.  This option is passed directly to
+@command{gpg}.
+
+@item --require-compliance
+@opindex require-compliance
+This option is passed directly to @command{gpg}.
+
+@item --status-fd @var{n}
+@opindex status-fd
+Write special status strings to the file descriptor @var{n}.
+See the file DETAILS in the documentation for a listing of them.
+
+@item --with-log
+@opindex with-log
+When extracting an encrypted tarball also write a log file with the
+gpg output to a file named after the extraction directory with the
+suffix ".log".
 
 @item --set-filename @var{file}
 @opindex set-filename
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 8ec771f..f885673 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -30,7 +30,7 @@ AM_CPPFLAGS =
 
 include $(top_srcdir)/am/cmacros.am
 
-AM_CFLAGS = $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) \
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(SQLITE3_CFLAGS) \
             $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
 
 needed_libs = ../kbx/libkeybox.a $(libcommon) ../regexp/libregexp.a
@@ -181,7 +181,7 @@ gpgv_SOURCES = gpgv.c           \
 
 LDADD =  $(needed_libs) ../common/libgpgrl.a \
          $(ZLIBS) $(LIBINTL) $(CAPLIBS) $(NETLIBS)
-gpg_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
+gpg_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(SQLITE3_LIBS) $(LIBREADLINE) \
              $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
 	     $(LIBICONV) $(gpg_robjs) $(extra_sys_libs)
 gpg_LDFLAGS = $(extra_bin_ldflags)
diff --git a/g10/Makefile.in b/g10/Makefile.in
index dace3b2..1774106 100644
--- a/g10/Makefile.in
+++ b/g10/Makefile.in
@@ -474,6 +474,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
@@ -646,7 +647,7 @@ libcommon = ../common/libcommon.a
 libcommonpth = ../common/libcommonpth.a
 libcommontls = ../common/libcommontls.a
 libcommontlsnpth = ../common/libcommontlsnpth.a
-AM_CFLAGS = $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) \
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(SQLITE3_CFLAGS) \
             $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
 
 needed_libs = ../kbx/libkeybox.a $(libcommon) ../regexp/libregexp.a
@@ -756,7 +757,7 @@ gpgv_SOURCES = gpgv.c           \
 LDADD = $(needed_libs) ../common/libgpgrl.a \
          $(ZLIBS) $(LIBINTL) $(CAPLIBS) $(NETLIBS)
 
-gpg_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
+gpg_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(SQLITE3_LIBS) $(LIBREADLINE) \
              $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
 	     $(LIBICONV) $(gpg_robjs) $(extra_sys_libs)
 
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 14e40a1..266bf54 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -1504,9 +1504,12 @@ do_signature( IOBUF out, int ctb, PKT_signature *sig )
     {
       iobuf_put( a, 3 );
 
-      /* Version 3 packets don't support subpackets.  */
-      log_assert (! sig->hashed);
-      log_assert (! sig->unhashed);
+      /* Version 3 packets don't support subpackets.  Actually we
+       * should never get to here but real life is different and thus
+       * we now use a log_fatal instead of a log_assert here. */
+      if (sig->hashed || sig->unhashed)
+        log_fatal ("trying to write a subpacket to a v3 signature (%d,%d)\n",
+                   !!sig->hashed, !!sig->unhashed);
     }
   else
     iobuf_put( a, sig->version );
diff --git a/g10/call-agent.c b/g10/call-agent.c
index a9d7271..7e60542 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -974,9 +974,7 @@ agent_keytocard (const char *hexgrip, int keyno, int force,
 
   rc = assuan_transact (agent_ctx, line, NULL, NULL, default_inq_cb, &parm,
                         NULL, NULL);
-  if (rc)
-    return rc;
-
+  status_sc_op_failure (rc);
   return rc;
 }
 
@@ -1106,6 +1104,9 @@ agent_scd_getattr (const char *name, struct agent_card_info_s *info)
       if (info->fpr2valid)
         assuan_transact (agent_ctx, "READKEY --card --no-data -- $ENCRKEYID",
                          NULL, NULL, NULL, NULL, NULL, NULL);
+      if (info->fpr3valid)
+        assuan_transact (agent_ctx, "READKEY --card --no-data -- $AUTHKEYID",
+                         NULL, NULL, NULL, NULL, NULL, NULL);
     }
 
   return rc;
@@ -1416,6 +1417,29 @@ agent_scd_readkey (const char *keyrefstr, gcry_sexp_t *r_result)
 }
 
 
+/* This can be called for a quick and dirty update/creation of the
+ * shadow key stubs.   */
+gpg_error_t
+agent_update_shadow_keys (void)
+{
+  gpg_error_t err;
+
+  err = start_agent (NULL, 1);
+  if (err)
+    return err;
+
+  assuan_transact (agent_ctx, "READKEY --card --no-data -- $SIGNKEYID",
+                   NULL, NULL, NULL, NULL, NULL, NULL);
+  assuan_transact (agent_ctx, "READKEY --card --no-data -- $ENCRKEYID",
+                   NULL, NULL, NULL, NULL, NULL, NULL);
+  assuan_transact (agent_ctx, "READKEY --card --no-data -- $AUTHKEYID",
+                   NULL, NULL, NULL, NULL, NULL, NULL);
+
+  return err;
+}
+
+
+
 
 struct card_cardlist_parm_s {
   int error;
diff --git a/g10/call-agent.h b/g10/call-agent.h
index 76edb69..dbc6e2f 100644
--- a/g10/call-agent.h
+++ b/g10/call-agent.h
@@ -124,6 +124,9 @@ int agent_scd_readcert (const char *certidstr,
 /* Send a READKEY command to the SCdaemon.  */
 gpg_error_t agent_scd_readkey (const char *keyrefstr, gcry_sexp_t *r_result);
 
+/* Update common shadow key stubs.  */
+gpg_error_t agent_update_shadow_keys (void);
+
 /* Change the PIN of an OpenPGP card or reset the retry counter. */
 int agent_scd_change_pin (int chvno, const char *serialno);
 
diff --git a/g10/card-util.c b/g10/card-util.c
index 242fa94..25c284e 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -378,31 +378,34 @@ current_card_status (ctrl_t ctrl, estream_t fp,
   else
     tty_fprintf (fp, "Application ID ...: %s\n",
                  info.serialno? info.serialno : "[none]");
+
   if (!info.serialno || strncmp (info.serialno, "D27600012401", 12)
       || strlen (info.serialno) != 32 )
     {
       const char *name1, *name2;
-      if (info.apptype && !strcmp (info.apptype, "NKS"))
+      if (info.apptype && !ascii_strcasecmp (info.apptype, "openpgp"))
+        goto openpgp;
+      else if (info.apptype && !ascii_strcasecmp (info.apptype, "NKS"))
         {
           name1 = "netkey";
           name2 = "NetKey";
         }
-      else if (info.apptype && !strcmp (info.apptype, "DINSIG"))
+      else if (info.apptype && !ascii_strcasecmp (info.apptype, "DINSIG"))
         {
           name1 = "dinsig";
           name2 = "DINSIG";
         }
-      else if (info.apptype && !strcmp (info.apptype, "P15"))
+      else if (info.apptype && !ascii_strcasecmp (info.apptype, "P15"))
         {
           name1 = "pkcs15";
           name2 = "PKCS#15";
         }
-      else if (info.apptype && !strcmp (info.apptype, "GELDKARTE"))
+      else if (info.apptype && !ascii_strcasecmp (info.apptype, "GELDKARTE"))
         {
           name1 = "geldkarte";
           name2 = "Geldkarte";
         }
-      else if (info.apptype && !strcmp (info.apptype, "PIV"))
+      else if (info.apptype && !ascii_strcasecmp (info.apptype, "PIV"))
         {
           name1 = "piv";
           name2 = "PIV";
@@ -418,11 +421,15 @@ current_card_status (ctrl_t ctrl, estream_t fp,
       else
         tty_fprintf (fp, "Application type .: %s\n", name2);
 
+      /* Try to update/create the shadow key here for non-OpenPGP cards. */
+      agent_update_shadow_keys ();
+
       agent_release_card_info (&info);
       xfree (pk);
       return;
     }
 
+ openpgp:
   if (!serialno)
     ;
   else if (strlen (info.serialno)+1 > serialnobuflen)
@@ -435,6 +442,8 @@ current_card_status (ctrl_t ctrl, estream_t fp,
   else
     tty_fprintf (fp, "Application type .: %s\n", "OpenPGP");
 
+  /* Try to update/create the shadow key here for OpenPGP cards. */
+  agent_update_shadow_keys ();
 
   if (opt.with_colons)
     {
@@ -1236,8 +1245,9 @@ get_info_for_key_operation (struct agent_card_info_s *info)
 
   memset (info, 0, sizeof *info);
   rc = agent_scd_getattr ("SERIALNO", info);
-  if (rc || !info->serialno || strncmp (info->serialno, "D27600012401", 12)
-      || strlen (info->serialno) != 32 )
+  if (!rc)
+    rc = agent_scd_getattr ("APPTYPE", info);
+  if (rc || !info->apptype || ascii_strcasecmp (info->apptype, "openpgp"))
     {
       log_error (_("key operation not possible: %s\n"),
                  rc ? gpg_strerror (rc) : _("not an OpenPGP card"));
diff --git a/g10/cpr.c b/g10/cpr.c
index d502e8b..bc4b715 100644
--- a/g10/cpr.c
+++ b/g10/cpr.c
@@ -328,20 +328,15 @@ write_status_text_and_buffer (int no, const char *string,
             }
           first = 0;
         }
-      for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
+      for (esc=0, s=buffer, n=len; n; s++, n--)
         {
           if (*s == '%' || *(const byte*)s <= lower_limit
               || *(const byte*)s == 127 )
             esc = 1;
           if (wrap && ++count > wrap)
-            {
-              dowrap=1;
-              break;
-            }
-        }
-      if (esc)
-        {
-          s--; n++;
+            dowrap=1;
+          if (esc || dowrap)
+            break;
         }
       if (s != buffer)
         es_fwrite (buffer, s-buffer, 1, statusfp);
diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c
index 2793885..f9fc1d2 100644
--- a/g10/decrypt-data.c
+++ b/g10/decrypt-data.c
@@ -215,10 +215,14 @@ aead_checktag (decode_filter_ctx_t dfx, int final, const void *tagbuf)
 
 
 /****************
- * Decrypt the data, specified by ED with the key DEK.
+ * Decrypt the data, specified by ED with the key DEK.  On return
+ * COMPLIANCE_ERROR is set to true iff the decryption can claim that
+ * it was compliant in the current mode; otherwise this flag is set to
+ * false.
  */
 int
-decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
+decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek,
+              int *compliance_error)
 {
   decode_filter_ctx_t dfx;
   enum gcry_cipher_modes ciphermode;
@@ -229,6 +233,8 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
   unsigned blocksize;
   unsigned nprefix;
 
+  *compliance_error = 0;
+
   dfx = xtrycalloc (1, sizeof *dfx);
   if (!dfx)
     return gpg_error_from_syserror ();
@@ -238,7 +244,7 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
     {
       if (!openpgp_cipher_test_algo (dek->algo))
         log_info (_("%s encrypted data\n"),
-                  openpgp_cipher_algo_name (dek->algo));
+                  openpgp_cipher_algo_mode_name (dek->algo, ed->aead_algo));
       else
         log_info (_("encrypted with unknown algorithm %d\n"), dek->algo );
       dek->algo_info_printed = 1;
@@ -258,10 +264,16 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
   if (!gnupg_cipher_is_allowed (opt.compliance, 0, dek->algo, ciphermode))
     {
       log_error (_("cipher algorithm '%s' may not be used in %s mode\n"),
-		 openpgp_cipher_algo_name (dek->algo),
+		 openpgp_cipher_algo_mode_name (dek->algo,ed->aead_algo),
 		 gnupg_compliance_option_string (opt.compliance));
-      rc = gpg_error (GPG_ERR_CIPHER_ALGO);
-      goto leave;
+      *compliance_error = 1;
+      if (opt.flags.require_compliance)
+        {
+          /* We fail early in this case because it does not make sense
+           * to first decrypt everything.  */
+          rc = gpg_error (GPG_ERR_CIPHER_ALGO);
+          goto leave;
+        }
     }
 
   write_status_printf (STATUS_DECRYPTION_INFO, "%d %d %d",
@@ -420,6 +432,7 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
       if (!ed->buf)
         {
           log_error (_("problem handling encrypted packet\n"));
+          rc = gpg_error (GPG_ERR_INV_PACKET);
           goto leave;
         }
 
diff --git a/g10/encrypt.c b/g10/encrypt.c
index 94e233b..e3e044f 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -655,6 +655,18 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
                           gnupg_status_compliance_flag (CO_DE_VS),
                           NULL);
 
+  if (opt.flags.require_compliance
+      && opt.compliance == CO_DE_VS
+      && !compliant)
+    {
+      log_error (_("operation forced to fail due to"
+                   " unfulfilled compliance rules\n"));
+      rc = gpg_error (GPG_ERR_FORBIDDEN);
+      g10_errors_seen = 1;
+      goto leave;
+    }
+
+
   cfx.dek->use_mdc = use_mdc (pk_list,cfx.dek->algo);
 
   /* Only do the is-file-already-compressed check if we are using a
diff --git a/g10/gpg.c b/g10/gpg.c
index 07bca34..0812944 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1,7 +1,7 @@
 /* gpg.c - The GnuPG utility (main for gpg)
  * Copyright (C) 1998-2020 Free Software Foundation, Inc.
  * Copyright (C) 1997-2019 Werner Koch
- * Copyright (C) 2015-2020 g10 Code GmbH
+ * Copyright (C) 2015-2021 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -430,6 +430,7 @@ enum cmd_and_opt_values
     oNoIncludeKeyBlock,
     oForceSignKey,
     oForbidGenKey,
+    oRequireCompliance,
 
     oNoop
   };
@@ -537,6 +538,7 @@ static ARGPARSE_OPTS opts[] = {
               N_("update the trust database")),
   ARGPARSE_c (aCheckTrustDB, "check-trustdb", "@"),
   ARGPARSE_c (aFixTrustDB, "fix-trustdb", "@"),
+  ARGPARSE_c (aListTrustDB, "list-trustdb", "@"),
 #endif
 
   ARGPARSE_c (aDeArmor, "dearmor", "@"),
@@ -544,115 +546,64 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_c (aEnArmor, "enarmor", "@"),
   ARGPARSE_c (aEnArmor, "enarmour", "@"),
   ARGPARSE_c (aPrintMD, "print-md", N_("print message digests")),
+  ARGPARSE_c (aPrintMDs, "print-mds", "@"), /* old */
   ARGPARSE_c (aPrimegen, "gen-prime", "@" ),
   ARGPARSE_c (aGenRandom,"gen-random", "@" ),
   ARGPARSE_c (aServer,   "server",  N_("run in server mode")),
   ARGPARSE_c (aTOFUPolicy, "tofu-policy",
 	      N_("|VALUE|set the TOFU policy for a key")),
+  /* Not yet used:
+     ARGPARSE_c (aListTrustPath, "list-trust-path", "@"), */
+  ARGPARSE_c (aDeleteSecretAndPublicKeys,
+              "delete-secret-and-public-keys", "@"),
+  ARGPARSE_c (aRebuildKeydbCaches, "rebuild-keydb-caches", "@"),
+  ARGPARSE_c (aListKeys, "list-key", "@"),   /* alias */
+  ARGPARSE_c (aListSigs, "list-sig", "@"),   /* alias */
+  ARGPARSE_c (aCheckKeys, "check-sig", "@"), /* alias */
+  ARGPARSE_c (aShowKeys,  "show-key", "@"), /* alias */
 
-  ARGPARSE_group (301, N_("@\nOptions:\n ")),
-
-  ARGPARSE_s_n (oArmor, "armor", N_("create ascii armored output")),
-  ARGPARSE_s_n (oArmor, "armour", "@"),
-
-  ARGPARSE_s_s (oRecipient, "recipient", N_("|USER-ID|encrypt for USER-ID")),
-  ARGPARSE_s_s (oHiddenRecipient, "hidden-recipient", "@"),
-  ARGPARSE_s_s (oRecipientFile, "recipient-file", "@"),
-  ARGPARSE_s_s (oHiddenRecipientFile, "hidden-recipient-file", "@"),
-  ARGPARSE_s_s (oRecipient, "remote-user", "@"),  /* (old option name) */
-  ARGPARSE_s_s (oDefRecipient, "default-recipient", "@"),
-  ARGPARSE_s_n (oDefRecipientSelf,  "default-recipient-self", "@"),
-  ARGPARSE_s_n (oNoDefRecipient, "no-default-recipient", "@"),
-
-  ARGPARSE_s_s (oTempDir,  "temp-directory", "@"),
-  ARGPARSE_s_s (oExecPath, "exec-path", "@"),
-  ARGPARSE_s_s (oEncryptTo,      "encrypt-to", "@"),
-  ARGPARSE_s_n (oNoEncryptTo, "no-encrypt-to", "@"),
-  ARGPARSE_s_s (oHiddenEncryptTo, "hidden-encrypt-to", "@"),
-  ARGPARSE_s_n (oEncryptToDefaultKey, "encrypt-to-default-key", "@"),
-  ARGPARSE_s_s (oLocalUser, "local-user",
-                N_("|USER-ID|use USER-ID to sign or decrypt")),
-  ARGPARSE_s_s (oSender, "sender", "@"),
-
-  ARGPARSE_s_s (oTrySecretKey, "try-secret-key", "@"),
-
-  ARGPARSE_s_i (oCompress, NULL,
-                N_("|N|set compress level to N (0 disables)")),
-  ARGPARSE_s_i (oCompressLevel, "compress-level", "@"),
-  ARGPARSE_s_i (oBZ2CompressLevel, "bzip2-compress-level", "@"),
-  ARGPARSE_s_n (oBZ2DecompressLowmem, "bzip2-decompress-lowmem", "@"),
-
-  ARGPARSE_s_n (oMimemode, "mimemode", "@"),
-  ARGPARSE_s_n (oTextmodeShort, NULL, "@"),
-  ARGPARSE_s_n (oTextmode,   "textmode", N_("use canonical text mode")),
-  ARGPARSE_s_n (oNoTextmode, "no-textmode", "@"),
-
-  ARGPARSE_s_n (oExpert,      "expert", "@"),
-  ARGPARSE_s_n (oNoExpert, "no-expert", "@"),
 
-  ARGPARSE_s_s (oDefSigExpire, "default-sig-expire", "@"),
-  ARGPARSE_s_n (oAskSigExpire,      "ask-sig-expire", "@"),
-  ARGPARSE_s_n (oNoAskSigExpire, "no-ask-sig-expire", "@"),
-  ARGPARSE_s_s (oDefCertExpire, "default-cert-expire", "@"),
-  ARGPARSE_s_n (oAskCertExpire,      "ask-cert-expire", "@"),
-  ARGPARSE_s_n (oNoAskCertExpire, "no-ask-cert-expire", "@"),
-  ARGPARSE_s_i (oDefCertLevel, "default-cert-level", "@"),
-  ARGPARSE_s_i (oMinCertLevel, "min-cert-level", "@"),
-  ARGPARSE_s_n (oAskCertLevel,      "ask-cert-level", "@"),
-  ARGPARSE_s_n (oNoAskCertLevel, "no-ask-cert-level", "@"),
-
-  ARGPARSE_s_s (oOutput, "output", N_("|FILE|write output to FILE")),
-  ARGPARSE_p_u (oMaxOutput, "max-output", "@"),
-  ARGPARSE_s_s (oInputSizeHint, "input-size-hint", "@"),
+  ARGPARSE_header ("Monitor", N_("Options controlling the diagnostic output")),
 
   ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
-  ARGPARSE_s_n (oQuiet,	  "quiet",   "@"),
+  ARGPARSE_s_n (oNoVerbose, "no-verbose", "@"),
+  ARGPARSE_s_n (oQuiet,	  "quiet",   N_("be somewhat more quiet")),
   ARGPARSE_s_n (oNoTTY,   "no-tty",  "@"),
-
-  ARGPARSE_s_n (oDisableSignerUID, "disable-signer-uid", "@"),
-
-  ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")),
-  ARGPARSE_s_n (oInteractive, "interactive", N_("prompt before overwriting")),
-
-  ARGPARSE_s_n (oBatch, "batch", "@"),
-  ARGPARSE_s_n (oAnswerYes, "yes", "@"),
-  ARGPARSE_s_n (oAnswerNo, "no", "@"),
-  ARGPARSE_s_s (oKeyring, "keyring", "@"),
-  ARGPARSE_s_s (oPrimaryKeyring, "primary-keyring", "@"),
-  ARGPARSE_s_s (oSecretKeyring, "secret-keyring", "@"),
-  ARGPARSE_s_n (oShowKeyring, "show-keyring", "@"),
-  ARGPARSE_s_s (oDefaultKey, "default-key", "@"),
-
-  ARGPARSE_s_s (oKeyServer, "keyserver", "@"),
-  ARGPARSE_s_s (oKeyServerOptions, "keyserver-options", "@"),
-  ARGPARSE_s_s (oKeyOrigin, "key-origin", "@"),
-  ARGPARSE_s_s (oImportOptions, "import-options", "@"),
-  ARGPARSE_s_s (oImportFilter,  "import-filter", "@"),
-  ARGPARSE_s_s (oExportOptions, "export-options", "@"),
-  ARGPARSE_s_s (oExportFilter,  "export-filter", "@"),
-  ARGPARSE_s_s (oListOptions,   "list-options", "@"),
-  ARGPARSE_s_s (oVerifyOptions, "verify-options", "@"),
-
-  ARGPARSE_s_s (oDisplayCharset, "display-charset", "@"),
-  ARGPARSE_s_s (oDisplayCharset, "charset", "@"),
-  ARGPARSE_conffile (oOptions, "options", "@"),
-
+  ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
   ARGPARSE_s_s (oDebug, "debug", "@"),
   ARGPARSE_s_s (oDebugLevel, "debug-level", "@"),
   ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
   ARGPARSE_s_n (oDebugIOLBF, "debug-iolbf", "@"),
-  ARGPARSE_s_i (oStatusFD, "status-fd", "@"),
-  ARGPARSE_s_s (oStatusFile, "status-file", "@"),
-  ARGPARSE_s_i (oAttributeFD, "attribute-fd", "@"),
-  ARGPARSE_s_s (oAttributeFile, "attribute-file", "@"),
+  ARGPARSE_s_s (oDisplayCharset, "display-charset", "@"),
+  ARGPARSE_s_s (oDisplayCharset, "charset", "@"),
+  ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
+  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
+  ARGPARSE_s_i (oLoggerFD,   "logger-fd", "@"),
+  ARGPARSE_s_s (oLoggerFile, "log-file",
+                N_("|FILE|write server mode logs to FILE")),
+  ARGPARSE_s_s (oLoggerFile, "logger-file", "@"),  /* 1.4 compatibility.  */
+  ARGPARSE_s_n (oQuickRandom, "debug-quick-random", "@"),
 
-  ARGPARSE_s_i (oCompletesNeeded, "completes-needed", "@"),
-  ARGPARSE_s_i (oMarginalsNeeded, "marginals-needed", "@"),
-  ARGPARSE_s_i (oMaxCertDepth,	"max-cert-depth", "@" ),
-  ARGPARSE_s_s (oTrustedKey, "trusted-key", "@"),
 
-  ARGPARSE_s_s (oLoadExtension, "load-extension", "@"),  /* Dummy.  */
+  ARGPARSE_header ("Configuration",
+                   N_("Options controlling the configuration")),
 
+  ARGPARSE_s_s (oHomedir, "homedir", "@"),
+  ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
+  ARGPARSE_s_s (oDefaultKey, "default-key",
+                N_("|NAME|use NAME as default secret key")),
+  ARGPARSE_s_s (oEncryptTo,      "encrypt-to",
+                N_("|NAME|encrypt to user ID NAME as well")),
+  ARGPARSE_s_n (oNoEncryptTo, "no-encrypt-to", "@"),
+  ARGPARSE_s_s (oHiddenEncryptTo, "hidden-encrypt-to", "@"),
+  ARGPARSE_s_n (oEncryptToDefaultKey, "encrypt-to-default-key", "@"),
+  ARGPARSE_s_s (oDefRecipient, "default-recipient", "@"),
+  ARGPARSE_s_n (oDefRecipientSelf,  "default-recipient-self", "@"),
+  ARGPARSE_s_n (oNoDefRecipient, "no-default-recipient", "@"),
+  ARGPARSE_s_s (oGroup,      "group",
+                N_("|SPEC|set up email aliases")),
+  ARGPARSE_s_s (oUnGroup,    "ungroup",    "@"),
+  ARGPARSE_s_n (oNoGroups,   "no-groups",  "@"),
   ARGPARSE_s_s (oCompliance, "compliance",   "@"),
   ARGPARSE_s_n (oGnuPG, "gnupg",   "@"),
   ARGPARSE_s_n (oGnuPG, "no-pgp2", "@"),
@@ -666,112 +617,101 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oPGP6, "pgp6", "@"),
   ARGPARSE_s_n (oPGP7, "pgp7", "@"),
   ARGPARSE_s_n (oPGP8, "pgp8", "@"),
+  ARGPARSE_s_s (oDefaultNewKeyAlgo, "default-new-key-algo", "@"),
   ARGPARSE_p_u (oMinRSALength, "min-rsa-length", "@"),
-
-  ARGPARSE_s_n (oRFC2440Text,      "rfc2440-text", "@"),
-  ARGPARSE_s_n (oNoRFC2440Text, "no-rfc2440-text", "@"),
-  ARGPARSE_s_i (oS2KMode, "s2k-mode", "@"),
-  ARGPARSE_s_s (oS2KDigest, "s2k-digest-algo", "@"),
-  ARGPARSE_s_s (oS2KCipher, "s2k-cipher-algo", "@"),
-  ARGPARSE_s_i (oS2KCount, "s2k-count", "@"),
-  ARGPARSE_s_s (oCipherAlgo, "cipher-algo", "@"),
-  ARGPARSE_s_s (oDigestAlgo, "digest-algo", "@"),
-  ARGPARSE_s_s (oCertDigestAlgo, "cert-digest-algo", "@"),
-  ARGPARSE_s_s (oCompressAlgo,"compress-algo", "@"),
-  ARGPARSE_s_s (oCompressAlgo, "compression-algo", "@"), /* Alias */
-  ARGPARSE_s_n (oThrowKeyids, "throw-keyids", "@"),
-  ARGPARSE_s_n (oNoThrowKeyids, "no-throw-keyids", "@"),
-  ARGPARSE_s_n (oShowPhotos,   "show-photos", "@"),
-  ARGPARSE_s_n (oNoShowPhotos, "no-show-photos", "@"),
-  ARGPARSE_s_s (oPhotoViewer,  "photo-viewer", "@"),
-  ARGPARSE_s_s (oSetNotation,  "set-notation", "@"),
-  ARGPARSE_s_s (oSigNotation,  "sig-notation", "@"),
-  ARGPARSE_s_s (oCertNotation, "cert-notation", "@"),
-  ARGPARSE_s_s (oKnownNotation, "known-notation", "@"),
-  ARGPARSE_s_n (oOverrideComplianceCheck, "override-compliance-check", "@"),
-
-  ARGPARSE_group (302, N_(
-  "@\n(See the man page for a complete listing of all commands and options)\n"
-		      )),
-
-  ARGPARSE_group (303, N_("@\nExamples:\n\n"
-    " -se -r Bob [file]          sign and encrypt for user Bob\n"
-    " --clear-sign [file]        make a clear text signature\n"
-    " --detach-sign [file]       make a detached signature\n"
-    " --list-keys [names]        show keys\n"
-    " --fingerprint [names]      show fingerprints\n")),
-
-  /* More hidden commands and options. */
-  ARGPARSE_c (aPrintMDs, "print-mds", "@"), /* old */
-#ifndef NO_TRUST_MODELS
-  ARGPARSE_c (aListTrustDB, "list-trustdb", "@"),
-#endif
-
-  /* Not yet used:
-     ARGPARSE_c (aListTrustPath, "list-trust-path", "@"), */
-  ARGPARSE_c (aDeleteSecretAndPublicKeys,
-              "delete-secret-and-public-keys", "@"),
-  ARGPARSE_c (aRebuildKeydbCaches, "rebuild-keydb-caches", "@"),
-
-  ARGPARSE_o_s (oPassphrase,      "passphrase", "@"),
-  ARGPARSE_s_i (oPassphraseFD,    "passphrase-fd", "@"),
-  ARGPARSE_s_s (oPassphraseFile,  "passphrase-file", "@"),
-  ARGPARSE_s_i (oPassphraseRepeat,"passphrase-repeat", "@"),
-  ARGPARSE_s_s (oPinentryMode,    "pinentry-mode", "@"),
-  ARGPARSE_s_s (oRequestOrigin,   "request-origin", "@"),
-  ARGPARSE_s_i (oCommandFD, "command-fd", "@"),
-  ARGPARSE_s_s (oCommandFile, "command-file", "@"),
-  ARGPARSE_s_n (oQuickRandom, "debug-quick-random", "@"),
-  ARGPARSE_s_n (oNoVerbose, "no-verbose", "@"),
-
 #ifndef NO_TRUST_MODELS
-  ARGPARSE_s_s (oTrustDBName, "trustdb-name", "@"),
-  ARGPARSE_s_n (oAutoCheckTrustDB, "auto-check-trustdb", "@"),
-  ARGPARSE_s_n (oNoAutoCheckTrustDB, "no-auto-check-trustdb", "@"),
-  ARGPARSE_s_s (oForceOwnertrust, "force-ownertrust", "@"),
+  ARGPARSE_s_n (oAlwaysTrust, "always-trust", "@"),
 #endif
-
+  ARGPARSE_s_s (oTrustModel, "trust-model", "@"),
+  ARGPARSE_s_s (oPhotoViewer,  "photo-viewer", "@"),
+  ARGPARSE_s_s (oKnownNotation, "known-notation", "@"),
+  ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
+  ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"),
+  ARGPARSE_s_n (oExitOnStatusWriteError, "exit-on-status-write-error", "@"),
+  ARGPARSE_s_i (oLimitCardInsertTries, "limit-card-insert-tries", "@"),
+  ARGPARSE_s_n (oEnableProgressFilter, "enable-progress-filter", "@"),
+  ARGPARSE_s_s (oTempDir,  "temp-directory", "@"),
+  ARGPARSE_s_s (oExecPath, "exec-path", "@"),
+  ARGPARSE_s_n (oExpert,      "expert", "@"),
+  ARGPARSE_s_n (oNoExpert, "no-expert", "@"),
   ARGPARSE_s_n (oNoSecmemWarn, "no-secmem-warning", "@"),
   ARGPARSE_s_n (oRequireSecmem, "require-secmem", "@"),
   ARGPARSE_s_n (oNoRequireSecmem, "no-require-secmem", "@"),
   ARGPARSE_s_n (oNoPermissionWarn, "no-permission-warning", "@"),
-  ARGPARSE_s_n (oNoArmor, "no-armor", "@"),
-  ARGPARSE_s_n (oNoArmor, "no-armour", "@"),
-  ARGPARSE_s_n (oNoDefKeyring, "no-default-keyring", "@"),
-  ARGPARSE_s_n (oNoKeyring, "no-keyring", "@"),
-  ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
-  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
-  ARGPARSE_s_s (oHomedir, "homedir", "@"),
-  ARGPARSE_s_n (oNoBatch, "no-batch", "@"),
-  ARGPARSE_s_n (oWithColons, "with-colons", "@"),
-  ARGPARSE_s_n (oWithTofuInfo,"with-tofu-info", "@"),
-  ARGPARSE_s_n (oWithKeyData,"with-key-data", "@"),
-  ARGPARSE_s_n (oWithSigList,"with-sig-list", "@"),
-  ARGPARSE_s_n (oWithSigCheck,"with-sig-check", "@"),
-  ARGPARSE_c (aListKeys, "list-key", "@"),   /* alias */
-  ARGPARSE_c (aListSigs, "list-sig", "@"),   /* alias */
-  ARGPARSE_c (aCheckKeys, "check-sig", "@"), /* alias */
-  ARGPARSE_c (aShowKeys,  "show-key", "@"), /* alias */
-  ARGPARSE_s_n (oSkipVerify, "skip-verify", "@"),
-  ARGPARSE_s_n (oSkipHiddenRecipients, "skip-hidden-recipients", "@"),
-  ARGPARSE_s_n (oNoSkipHiddenRecipients, "no-skip-hidden-recipients", "@"),
+  ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")),
+  ARGPARSE_s_n (oInteractive, "interactive", N_("prompt before overwriting")),
+  ARGPARSE_s_s (oDefSigExpire, "default-sig-expire", "@"),
+  ARGPARSE_s_n (oAskSigExpire,      "ask-sig-expire", "@"),
+  ARGPARSE_s_n (oNoAskSigExpire, "no-ask-sig-expire", "@"),
+  ARGPARSE_s_s (oDefCertExpire, "default-cert-expire", "@"),
+  ARGPARSE_s_n (oAskCertExpire,      "ask-cert-expire", "@"),
+  ARGPARSE_s_n (oNoAskCertExpire, "no-ask-cert-expire", "@"),
+  ARGPARSE_s_i (oDefCertLevel, "default-cert-level", "@"),
+  ARGPARSE_s_i (oMinCertLevel, "min-cert-level", "@"),
+  ARGPARSE_s_n (oAskCertLevel,      "ask-cert-level", "@"),
+  ARGPARSE_s_n (oNoAskCertLevel, "no-ask-cert-level", "@"),
+  ARGPARSE_s_n (oOnlySignTextIDs, "only-sign-text-ids", "@"),
+  ARGPARSE_s_n (oEnableLargeRSA, "enable-large-rsa", "@"),
+  ARGPARSE_s_n (oDisableLargeRSA, "disable-large-rsa", "@"),
+  ARGPARSE_s_n (oEnableDSA2, "enable-dsa2", "@"),
+  ARGPARSE_s_n (oDisableDSA2, "disable-dsa2", "@"),
+  ARGPARSE_s_s (oPersonalCipherPreferences, "personal-cipher-preferences","@"),
+  ARGPARSE_s_s (oPersonalDigestPreferences, "personal-digest-preferences","@"),
+  ARGPARSE_s_s (oPersonalCompressPreferences,
+                                         "personal-compress-preferences", "@"),
+  ARGPARSE_s_s (oDefaultPreferenceList,  "default-preference-list", "@"),
+  ARGPARSE_s_s (oDefaultKeyserverURL,  "default-keyserver-url", "@"),
+  ARGPARSE_s_n (oNoExpensiveTrustChecks, "no-expensive-trust-checks", "@"),
+  ARGPARSE_s_n (oAllowNonSelfsignedUID,      "allow-non-selfsigned-uid", "@"),
+  ARGPARSE_s_n (oNoAllowNonSelfsignedUID, "no-allow-non-selfsigned-uid", "@"),
+  ARGPARSE_s_n (oAllowFreeformUID,      "allow-freeform-uid", "@"),
+  ARGPARSE_s_n (oNoAllowFreeformUID, "no-allow-freeform-uid", "@"),
+  ARGPARSE_s_n (oPreservePermissions, "preserve-permissions", "@"),
   ARGPARSE_s_i (oDefCertLevel, "default-cert-check-level", "@"), /* old */
+  ARGPARSE_s_s (oTOFUDefaultPolicy, "tofu-default-policy", "@"),
+  ARGPARSE_s_n (oLockOnce,     "lock-once", "@"),
+  ARGPARSE_s_n (oLockMultiple, "lock-multiple", "@"),
+  ARGPARSE_s_n (oLockNever,    "lock-never", "@"),
+  ARGPARSE_s_s (oCompressAlgo,"compress-algo", "@"),
+  ARGPARSE_s_s (oCompressAlgo, "compression-algo", "@"), /* Alias */
+  ARGPARSE_s_n (oBZ2DecompressLowmem, "bzip2-decompress-lowmem", "@"),
+  ARGPARSE_s_i (oCompletesNeeded, "completes-needed", "@"),
+  ARGPARSE_s_i (oMarginalsNeeded, "marginals-needed", "@"),
+  ARGPARSE_s_i (oMaxCertDepth,	"max-cert-depth", "@" ),
 #ifndef NO_TRUST_MODELS
-  ARGPARSE_s_n (oAlwaysTrust, "always-trust", "@"),
+  ARGPARSE_s_s (oTrustDBName, "trustdb-name", "@"),
+  ARGPARSE_s_n (oAutoCheckTrustDB, "auto-check-trustdb", "@"),
+  ARGPARSE_s_n (oNoAutoCheckTrustDB, "no-auto-check-trustdb", "@"),
+  ARGPARSE_s_s (oForceOwnertrust, "force-ownertrust", "@"),
 #endif
-  ARGPARSE_s_s (oTrustModel, "trust-model", "@"),
-  ARGPARSE_s_s (oTOFUDefaultPolicy, "tofu-default-policy", "@"),
-  ARGPARSE_s_s (oSetFilename, "set-filename", "@"),
-  ARGPARSE_s_n (oForYourEyesOnly, "for-your-eyes-only", "@"),
-  ARGPARSE_s_n (oNoForYourEyesOnly, "no-for-your-eyes-only", "@"),
+
+
+  ARGPARSE_header ("Input", N_("Options controlling the input")),
+
+  ARGPARSE_s_n (oMultifile, "multifile", "@"),
+  ARGPARSE_s_s (oInputSizeHint, "input-size-hint", "@"),
+  ARGPARSE_s_n (oUtf8Strings,      "utf8-strings", "@"),
+  ARGPARSE_s_n (oNoUtf8Strings, "no-utf8-strings", "@"),
+  ARGPARSE_p_u (oSetFilesize, "set-filesize", "@"),
+  ARGPARSE_s_n (oNoLiteral, "no-literal", "@"),
+  ARGPARSE_s_s (oSetNotation,  "set-notation", "@"),
+  ARGPARSE_s_s (oSigNotation,  "sig-notation", "@"),
+  ARGPARSE_s_s (oCertNotation, "cert-notation", "@"),
   ARGPARSE_s_s (oSetPolicyURL,  "set-policy-url", "@"),
   ARGPARSE_s_s (oSigPolicyURL,  "sig-policy-url", "@"),
   ARGPARSE_s_s (oCertPolicyURL, "cert-policy-url", "@"),
-  ARGPARSE_s_n (oShowPolicyURL,      "show-policy-url", "@"),
-  ARGPARSE_s_n (oNoShowPolicyURL, "no-show-policy-url", "@"),
   ARGPARSE_s_s (oSigKeyserverURL, "sig-keyserver-url", "@"),
-  ARGPARSE_s_n (oShowNotation,      "show-notation", "@"),
-  ARGPARSE_s_n (oNoShowNotation, "no-show-notation", "@"),
+
+
+
+  ARGPARSE_header ("Output", N_("Options controlling the output")),
+
+  ARGPARSE_s_n (oArmor, "armor", N_("create ascii armored output")),
+  ARGPARSE_s_n (oArmor, "armour", "@"),
+  ARGPARSE_s_n (oNoArmor, "no-armor", "@"),
+  ARGPARSE_s_n (oNoArmor, "no-armour", "@"),
+  ARGPARSE_s_s (oOutput, "output", N_("|FILE|write output to FILE")),
+  ARGPARSE_p_u (oMaxOutput, "max-output", "@"),
   ARGPARSE_s_s (oComment, "comment", "@"),
   ARGPARSE_s_n (oDefaultComment, "default-comment", "@"),
   ARGPARSE_s_n (oNoComments, "no-comments", "@"),
@@ -781,16 +721,68 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oNotDashEscaped, "not-dash-escaped", "@"),
   ARGPARSE_s_n (oEscapeFrom,      "escape-from-lines", "@"),
   ARGPARSE_s_n (oNoEscapeFrom, "no-escape-from-lines", "@"),
-  ARGPARSE_s_n (oLockOnce,     "lock-once", "@"),
-  ARGPARSE_s_n (oLockMultiple, "lock-multiple", "@"),
-  ARGPARSE_s_n (oLockNever,    "lock-never", "@"),
-  ARGPARSE_s_i (oLoggerFD,   "logger-fd", "@"),
-  ARGPARSE_s_s (oLoggerFile, "log-file", "@"),
-  ARGPARSE_s_s (oLoggerFile, "logger-file", "@"),  /* 1.4 compatibility.  */
+  ARGPARSE_s_n (oMimemode, "mimemode", "@"),
+  ARGPARSE_s_n (oTextmodeShort, NULL, "@"),
+  ARGPARSE_s_n (oTextmode,   "textmode", N_("use canonical text mode")),
+  ARGPARSE_s_n (oNoTextmode, "no-textmode", "@"),
+  ARGPARSE_s_s (oSetFilename, "set-filename", "@"),
+  ARGPARSE_s_n (oForYourEyesOnly, "for-your-eyes-only", "@"),
+  ARGPARSE_s_n (oNoForYourEyesOnly, "no-for-your-eyes-only", "@"),
+  ARGPARSE_s_n (oShowNotation,      "show-notation", "@"),
+  ARGPARSE_s_n (oNoShowNotation, "no-show-notation", "@"),
+  ARGPARSE_s_n (oShowSessionKey, "show-session-key", "@"),
   ARGPARSE_s_n (oUseEmbeddedFilename,      "use-embedded-filename", "@"),
   ARGPARSE_s_n (oNoUseEmbeddedFilename, "no-use-embedded-filename", "@"),
-  ARGPARSE_s_n (oUtf8Strings,      "utf8-strings", "@"),
-  ARGPARSE_s_n (oNoUtf8Strings, "no-utf8-strings", "@"),
+  ARGPARSE_s_n (oUnwrap, "unwrap", "@"),
+  ARGPARSE_s_n (oMangleDosFilenames,      "mangle-dos-filenames", "@"),
+  ARGPARSE_s_n (oNoMangleDosFilenames, "no-mangle-dos-filenames", "@"),
+  ARGPARSE_s_n (oNoSymkeyCache, "no-symkey-cache", "@"),
+  ARGPARSE_s_n (oSkipVerify, "skip-verify", "@"),
+  ARGPARSE_s_n (oListOnly, "list-only", "@"),
+  ARGPARSE_s_i (oCompress, NULL,
+                N_("|N|set compress level to N (0 disables)")),
+  ARGPARSE_s_i (oCompressLevel, "compress-level", "@"),
+  ARGPARSE_s_i (oBZ2CompressLevel, "bzip2-compress-level", "@"),
+  ARGPARSE_s_n (oDisableSignerUID, "disable-signer-uid", "@"),
+
+
+  ARGPARSE_header ("ImportExport",
+                   N_("Options controlling key import and export")),
+
+  ARGPARSE_s_s (oAutoKeyLocate, "auto-key-locate",
+              N_("|MECHANISMS|use MECHANISMS to locate keys by mail address")),
+  ARGPARSE_s_n (oNoAutoKeyLocate, "no-auto-key-locate", "@"),
+  ARGPARSE_s_n (oAutoKeyImport,   "auto-key-import", "@"),
+  ARGPARSE_s_n (oNoAutoKeyImport, "no-auto-key-import", "@"),
+  ARGPARSE_s_n (oAutoKeyRetrieve, "auto-key-retrieve", "@"),
+  ARGPARSE_s_n (oNoAutoKeyRetrieve, "no-auto-key-retrieve", "@"),
+  ARGPARSE_s_n (oIncludeKeyBlock, "include-key-block", "@"),
+  ARGPARSE_s_n (oNoIncludeKeyBlock, "no-include-key-block", "@"),
+  ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr",
+                N_("disable all access to the dirmngr")),
+  ARGPARSE_s_s (oKeyServer, "keyserver", "@"), /* Deprecated.  */
+  ARGPARSE_s_s (oKeyServerOptions, "keyserver-options", "@"),
+  ARGPARSE_s_s (oKeyOrigin, "key-origin", "@"),
+  ARGPARSE_s_s (oImportOptions, "import-options", "@"),
+  ARGPARSE_s_s (oImportFilter,  "import-filter", "@"),
+  ARGPARSE_s_s (oExportOptions, "export-options", "@"),
+  ARGPARSE_s_s (oExportFilter,  "export-filter", "@"),
+  ARGPARSE_s_n (oMergeOnly,	  "merge-only", "@" ),
+  ARGPARSE_s_n (oAllowSecretKeyImport, "allow-secret-key-import", "@"),
+
+
+  ARGPARSE_header ("Keylist", N_("Options controlling key listings")),
+
+  ARGPARSE_s_s (oListOptions,   "list-options", "@"),
+  ARGPARSE_s_n (oShowPhotos,   "show-photos", "@"),
+  ARGPARSE_s_n (oNoShowPhotos, "no-show-photos", "@"),
+  ARGPARSE_s_n (oShowPolicyURL,      "show-policy-url", "@"),
+  ARGPARSE_s_n (oNoShowPolicyURL, "no-show-policy-url", "@"),
+  ARGPARSE_s_n (oWithColons, "with-colons", "@"),
+  ARGPARSE_s_n (oWithTofuInfo,"with-tofu-info", "@"),
+  ARGPARSE_s_n (oWithKeyData,"with-key-data", "@"),
+  ARGPARSE_s_n (oWithSigList,"with-sig-list", "@"),
+  ARGPARSE_s_n (oWithSigCheck,"with-sig-check", "@"),
   ARGPARSE_s_n (oWithFingerprint, "with-fingerprint", "@"),
   ARGPARSE_s_n (oWithSubkeyFingerprint, "with-subkey-fingerprint", "@"),
   ARGPARSE_s_n (oWithSubkeyFingerprint, "with-subkey-fingerprints", "@"),
@@ -799,89 +791,122 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oWithSecret,      "with-secret", "@"),
   ARGPARSE_s_n (oWithWKDHash,     "with-wkd-hash", "@"),
   ARGPARSE_s_n (oWithKeyOrigin,   "with-key-origin", "@"),
-  ARGPARSE_s_s (oDisableCipherAlgo,  "disable-cipher-algo", "@"),
-  ARGPARSE_s_s (oDisablePubkeyAlgo,  "disable-pubkey-algo", "@"),
-  ARGPARSE_s_n (oAllowNonSelfsignedUID,      "allow-non-selfsigned-uid", "@"),
-  ARGPARSE_s_n (oNoAllowNonSelfsignedUID, "no-allow-non-selfsigned-uid", "@"),
-  ARGPARSE_s_n (oAllowFreeformUID,      "allow-freeform-uid", "@"),
-  ARGPARSE_s_n (oNoAllowFreeformUID, "no-allow-freeform-uid", "@"),
-  ARGPARSE_s_n (oNoLiteral, "no-literal", "@"),
-  ARGPARSE_p_u (oSetFilesize, "set-filesize", "@"),
   ARGPARSE_s_n (oFastListMode, "fast-list-mode", "@"),
   ARGPARSE_s_n (oFixedListMode, "fixed-list-mode", "@"),
   ARGPARSE_s_n (oLegacyListMode, "legacy-list-mode", "@"),
-  ARGPARSE_s_n (oListOnly, "list-only", "@"),
   ARGPARSE_s_n (oPrintPKARecords, "print-pka-records", "@"),
   ARGPARSE_s_n (oPrintDANERecords, "print-dane-records", "@"),
-  ARGPARSE_s_n (oIgnoreTimeConflict, "ignore-time-conflict", "@"),
-  ARGPARSE_s_n (oIgnoreValidFrom,    "ignore-valid-from", "@"),
-  ARGPARSE_s_n (oIgnoreCrcError, "ignore-crc-error", "@"),
-  ARGPARSE_s_n (oIgnoreMDCError, "ignore-mdc-error", "@"),
-  ARGPARSE_s_n (oShowSessionKey, "show-session-key", "@"),
+  ARGPARSE_s_s (oKeyidFormat, "keyid-format", "@"),
+  ARGPARSE_s_n (oShowKeyring, "show-keyring", "@"),
+
+
+  ARGPARSE_header (NULL, N_("Options to specify keys")),
+
+  ARGPARSE_s_s (oRecipient, "recipient", N_("|USER-ID|encrypt for USER-ID")),
+  ARGPARSE_s_s (oHiddenRecipient, "hidden-recipient", "@"),
+  ARGPARSE_s_s (oRecipientFile, "recipient-file", "@"),
+  ARGPARSE_s_s (oHiddenRecipientFile, "hidden-recipient-file", "@"),
+  ARGPARSE_s_s (oRecipient, "remote-user", "@"),  /* (old option name) */
+  ARGPARSE_s_n (oThrowKeyids, "throw-keyids", "@"),
+  ARGPARSE_s_n (oNoThrowKeyids, "no-throw-keyids", "@"),
+  ARGPARSE_s_s (oLocalUser, "local-user",
+                N_("|USER-ID|use USER-ID to sign or decrypt")),
+  ARGPARSE_s_s (oTrustedKey, "trusted-key", "@"),
+  ARGPARSE_s_s (oSender, "sender", "@"),
+  ARGPARSE_s_s (oTrySecretKey, "try-secret-key", "@"),
+  ARGPARSE_s_n (oTryAllSecrets,  "try-all-secrets", "@"),
+  ARGPARSE_s_n (oNoDefKeyring, "no-default-keyring", "@"),
+  ARGPARSE_s_n (oNoKeyring, "no-keyring", "@"),
+  ARGPARSE_s_s (oKeyring, "keyring", "@"),
+  ARGPARSE_s_s (oPrimaryKeyring, "primary-keyring", "@"),
+  ARGPARSE_s_s (oSecretKeyring, "secret-keyring", "@"),
+  ARGPARSE_s_n (oSkipHiddenRecipients, "skip-hidden-recipients", "@"),
+  ARGPARSE_s_n (oNoSkipHiddenRecipients, "no-skip-hidden-recipients", "@"),
   ARGPARSE_s_s (oOverrideSessionKey, "override-session-key", "@"),
   ARGPARSE_s_i (oOverrideSessionKeyFD, "override-session-key-fd", "@"),
+
+
+  ARGPARSE_header ("Security", N_("Options controlling the security")),
+
+  ARGPARSE_s_i (oS2KMode, "s2k-mode", "@"),
+  ARGPARSE_s_s (oS2KDigest, "s2k-digest-algo", "@"),
+  ARGPARSE_s_s (oS2KCipher, "s2k-cipher-algo", "@"),
+  ARGPARSE_s_i (oS2KCount, "s2k-count", "@"),
+  ARGPARSE_s_n (oRequireCrossCert, "require-backsigs", "@"),
+  ARGPARSE_s_n (oRequireCrossCert, "require-cross-certification", "@"),
+  ARGPARSE_s_n (oNoRequireCrossCert, "no-require-backsigs", "@"),
+  ARGPARSE_s_n (oNoRequireCrossCert, "no-require-cross-certification", "@"),
+  ARGPARSE_s_s (oVerifyOptions, "verify-options", "@"),
+  ARGPARSE_s_n (oEnableSpecialFilenames, "enable-special-filenames", "@"),
   ARGPARSE_s_n (oNoRandomSeedFile,  "no-random-seed-file", "@"),
-  ARGPARSE_s_n (oAutoKeyRetrieve, "auto-key-retrieve", "@"),
-  ARGPARSE_s_n (oNoAutoKeyRetrieve, "no-auto-key-retrieve", "@"),
   ARGPARSE_s_n (oNoSigCache,         "no-sig-cache", "@"),
-  ARGPARSE_s_n (oMergeOnly,	  "merge-only", "@" ),
-  ARGPARSE_s_n (oAllowSecretKeyImport, "allow-secret-key-import", "@"),
-  ARGPARSE_s_n (oTryAllSecrets,  "try-all-secrets", "@"),
-  ARGPARSE_s_n (oEnableSpecialFilenames, "enable-special-filenames", "@"),
-  ARGPARSE_s_n (oNoExpensiveTrustChecks, "no-expensive-trust-checks", "@"),
-  ARGPARSE_s_n (oPreservePermissions, "preserve-permissions", "@"),
-  ARGPARSE_s_s (oDefaultPreferenceList,  "default-preference-list", "@"),
-  ARGPARSE_s_s (oDefaultKeyserverURL,  "default-keyserver-url", "@"),
-  ARGPARSE_s_s (oPersonalCipherPreferences, "personal-cipher-preferences","@"),
-  ARGPARSE_s_s (oPersonalDigestPreferences, "personal-digest-preferences","@"),
-  ARGPARSE_s_s (oPersonalCompressPreferences,
-                                         "personal-compress-preferences", "@"),
-  ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
+  ARGPARSE_s_n (oIgnoreTimeConflict, "ignore-time-conflict", "@"),
+  ARGPARSE_s_n (oIgnoreValidFrom,    "ignore-valid-from", "@"),
+  ARGPARSE_s_n (oIgnoreCrcError, "ignore-crc-error", "@"),
+  ARGPARSE_s_n (oIgnoreMDCError, "ignore-mdc-error", "@"),
+  ARGPARSE_s_s (oDisableCipherAlgo,  "disable-cipher-algo", "@"),
+  ARGPARSE_s_s (oDisablePubkeyAlgo,  "disable-pubkey-algo", "@"),
+  ARGPARSE_s_s (oCipherAlgo, "cipher-algo", "@"),
+  ARGPARSE_s_s (oDigestAlgo, "digest-algo", "@"),
+  ARGPARSE_s_s (oCertDigestAlgo, "cert-digest-algo", "@"),
+  ARGPARSE_s_n (oOverrideComplianceCheck, "override-compliance-check", "@"),
+  /* Options to override new security defaults.  */
+  ARGPARSE_s_n (oAllowWeakKeySignatures, "allow-weak-key-signatures", "@"),
+  ARGPARSE_s_n (oAllowWeakDigestAlgos, "allow-weak-digest-algos", "@"),
   ARGPARSE_s_s (oWeakDigest, "weak-digest","@"),
-  ARGPARSE_s_n (oUnwrap, "unwrap", "@"),
-  ARGPARSE_s_n (oOnlySignTextIDs, "only-sign-text-ids", "@"),
+  ARGPARSE_s_n (oAllowMultisigVerification,
+                "allow-multisig-verification", "@"),
+  ARGPARSE_s_n (oAllowMultipleMessages,      "allow-multiple-messages", "@"),
+  ARGPARSE_s_n (oNoAllowMultipleMessages, "no-allow-multiple-messages", "@"),
+
+
+
+  ARGPARSE_header (NULL, N_("Options for unattended use")),
+
+  ARGPARSE_s_n (oBatch, "batch", "@"),
+  ARGPARSE_s_n (oNoBatch, "no-batch", "@"),
+  ARGPARSE_s_n (oAnswerYes, "yes", "@"),
+  ARGPARSE_s_n (oAnswerNo, "no", "@"),
+  ARGPARSE_s_i (oStatusFD, "status-fd", "@"),
+  ARGPARSE_s_s (oStatusFile, "status-file", "@"),
+  ARGPARSE_s_i (oAttributeFD, "attribute-fd", "@"),
+  ARGPARSE_s_s (oAttributeFile, "attribute-file", "@"),
+  ARGPARSE_s_i (oCommandFD, "command-fd", "@"),
+  ARGPARSE_s_s (oCommandFile, "command-file", "@"),
+  ARGPARSE_o_s (oPassphrase,      "passphrase", "@"),
+  ARGPARSE_s_i (oPassphraseFD,    "passphrase-fd", "@"),
+  ARGPARSE_s_s (oPassphraseFile,  "passphrase-file", "@"),
+  ARGPARSE_s_i (oPassphraseRepeat,"passphrase-repeat", "@"),
+  ARGPARSE_s_s (oPinentryMode,    "pinentry-mode", "@"),
   ARGPARSE_s_n (oForceSignKey,    "force-sign-key", "@"),
 
-  /* Aliases.  I constantly mistype these, and assume other people do
-     as well. */
-  ARGPARSE_s_s (oPersonalCipherPreferences, "personal-cipher-prefs", "@"),
-  ARGPARSE_s_s (oPersonalDigestPreferences, "personal-digest-prefs", "@"),
-  ARGPARSE_s_s (oPersonalCompressPreferences, "personal-compress-prefs", "@"),
+  ARGPARSE_header (NULL, N_("Other options")),
 
-  ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
-  ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"),
-  ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr", "@"),
+  ARGPARSE_s_s (oRequestOrigin,   "request-origin", "@"),
   ARGPARSE_s_s (oDisplay,    "display",    "@"),
   ARGPARSE_s_s (oTTYname,    "ttyname",    "@"),
   ARGPARSE_s_s (oTTYtype,    "ttytype",    "@"),
   ARGPARSE_s_s (oLCctype,    "lc-ctype",   "@"),
   ARGPARSE_s_s (oLCmessages, "lc-messages","@"),
   ARGPARSE_s_s (oXauthority, "xauthority", "@"),
-  ARGPARSE_s_s (oGroup,      "group",      "@"),
-  ARGPARSE_s_s (oUnGroup,    "ungroup",    "@"),
-  ARGPARSE_s_n (oNoGroups,   "no-groups",  "@"),
-  ARGPARSE_s_n (oStrict,     "strict",     "@"),
-  ARGPARSE_s_n (oNoStrict,   "no-strict",  "@"),
-  ARGPARSE_s_n (oMangleDosFilenames,      "mangle-dos-filenames", "@"),
-  ARGPARSE_s_n (oNoMangleDosFilenames, "no-mangle-dos-filenames", "@"),
-  ARGPARSE_s_n (oEnableProgressFilter, "enable-progress-filter", "@"),
-  ARGPARSE_s_n (oMultifile, "multifile", "@"),
-  ARGPARSE_s_s (oKeyidFormat, "keyid-format", "@"),
-  ARGPARSE_s_n (oExitOnStatusWriteError, "exit-on-status-write-error", "@"),
-  ARGPARSE_s_i (oLimitCardInsertTries, "limit-card-insert-tries", "@"),
+  ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"),
+  ARGPARSE_s_n (oForbidGenKey,  "forbid-gen-key", "@"),
+  ARGPARSE_s_n (oRequireCompliance, "require-compliance", "@"),
+  /* Options which can be used in special circumstances. They are not
+   * published and we hope they are never required.  */
+  ARGPARSE_s_n (oUseOnlyOpenPGPCard, "use-only-openpgp-card", "@"),
+  /* Esoteric compatibility options.  */
+  ARGPARSE_s_n (oRFC2440Text,      "rfc2440-text", "@"),
+  ARGPARSE_s_n (oNoRFC2440Text, "no-rfc2440-text", "@"),
 
-  ARGPARSE_s_n (oAllowMultisigVerification,
-                "allow-multisig-verification", "@"),
-  ARGPARSE_s_n (oEnableLargeRSA, "enable-large-rsa", "@"),
-  ARGPARSE_s_n (oDisableLargeRSA, "disable-large-rsa", "@"),
-  ARGPARSE_s_n (oEnableDSA2, "enable-dsa2", "@"),
-  ARGPARSE_s_n (oDisableDSA2, "disable-dsa2", "@"),
-  ARGPARSE_s_n (oAllowMultipleMessages,      "allow-multiple-messages", "@"),
-  ARGPARSE_s_n (oNoAllowMultipleMessages, "no-allow-multiple-messages", "@"),
-  ARGPARSE_s_n (oAllowWeakDigestAlgos, "allow-weak-digest-algos", "@"),
+  ARGPARSE_header (NULL, ""),  /* Stop the header group.  */
 
-  ARGPARSE_s_s (oDefaultNewKeyAlgo, "default-new-key-algo", "@"),
-  ARGPARSE_s_n (oForbidGenKey,  "forbid-gen-key", "@"),
+
+  /* Aliases.  I constantly mistype these, and assume other people do
+     as well. */
+  ARGPARSE_s_s (oPersonalCipherPreferences, "personal-cipher-prefs", "@"),
+  ARGPARSE_s_s (oPersonalDigestPreferences, "personal-digest-prefs", "@"),
+  ARGPARSE_s_s (oPersonalCompressPreferences, "personal-compress-prefs", "@"),
 
   /* These two are aliases to help users of the PGP command line
      product use gpg with minimal pain.  Many commands are common
@@ -890,27 +915,6 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_s (oLocalUser, "sign-with", "@"),
   ARGPARSE_s_s (oRecipient, "user", "@"),
 
-  ARGPARSE_s_n (oRequireCrossCert, "require-backsigs", "@"),
-  ARGPARSE_s_n (oRequireCrossCert, "require-cross-certification", "@"),
-  ARGPARSE_s_n (oNoRequireCrossCert, "no-require-backsigs", "@"),
-  ARGPARSE_s_n (oNoRequireCrossCert, "no-require-cross-certification", "@"),
-
-  /* New options.  Fixme: Should go more to the top.  */
-  ARGPARSE_s_s (oAutoKeyLocate, "auto-key-locate", "@"),
-  ARGPARSE_s_n (oNoAutoKeyLocate, "no-auto-key-locate", "@"),
-  ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"),
-  ARGPARSE_s_n (oNoSymkeyCache, "no-symkey-cache", "@"),
-  ARGPARSE_s_n (oIncludeKeyBlock, "include-key-block", "@"),
-  ARGPARSE_s_n (oNoIncludeKeyBlock, "no-include-key-block", "@"),
-  ARGPARSE_s_n (oAutoKeyImport,   "auto-key-import", "@"),
-  ARGPARSE_s_n (oNoAutoKeyImport, "no-auto-key-import", "@"),
-
-  /* Options to override new security defaults.  */
-  ARGPARSE_s_n (oAllowWeakKeySignatures, "allow-weak-key-signatures", "@"),
-
-  /* Options which can be used in special circumstances. They are not
-   * published and we hope they are never required.  */
-  ARGPARSE_s_n (oUseOnlyOpenPGPCard, "use-only-openpgp-card", "@"),
 
   /* Dummy options with warnings.  */
   ARGPARSE_s_n (oUseAgent,      "use-agent", "@"),
@@ -924,6 +928,10 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_s (oTOFUDBFormat, "tofu-db-format", "@"),
 
   /* Dummy options.  */
+  ARGPARSE_ignore (oStrict,     "strict"),
+  ARGPARSE_ignore (oNoStrict,   "no-strict"),
+  ARGPARSE_ignore (oLoadExtension, "load-extension"),  /* from 1.4. */
+
   ARGPARSE_s_n (oNoop, "sk-comments", "@"),
   ARGPARSE_s_n (oNoop, "no-sk-comments", "@"),
   ARGPARSE_s_n (oNoop, "compress-keys", "@"),
@@ -939,6 +947,18 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oNoop, "no-disable-mdc", "@"),
 
 
+  ARGPARSE_group (302, N_(
+  "@\n(See the man page for a complete listing of all commands and options)\n"
+		      )),
+
+  ARGPARSE_group (303, N_("@\nExamples:\n\n"
+    " -se -r Bob [file]          sign and encrypt for user Bob\n"
+    " --clear-sign [file]        make a clear text signature\n"
+    " --detach-sign [file]       make a detached signature\n"
+    " --list-keys [names]        show keys\n"
+    " --fingerprint [names]      show fingerprints\n")),
+
+
   ARGPARSE_end ()
 };
 
@@ -1297,6 +1317,12 @@ set_debug (const char *level)
 
   if (opt.debug)
     parse_debug_flag (NULL, &opt.debug, debug_flags);
+
+  /* Make sure that we are --verbose in debug mode.  */
+  if (opt.debug && !opt.verbose)
+    opt.verbose = 1;
+  if (opt.debug && opt.quiet)
+    opt.quiet = 0;
 }
 
 
@@ -1894,31 +1920,8 @@ gpgconf_list (const char *configfile)
 {
   char *configfile_esc = percent_escape (configfile, NULL);
 
-  es_printf ("%s-%s.conf:%lu:\"%s\n",
-             GPGCONF_NAME, GPG_NAME,
-             GC_OPT_FLAG_DEFAULT,
-             configfile_esc ? configfile_esc : "/dev/null");
-  es_printf ("verbose:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("quiet:%lu:\n",   GC_OPT_FLAG_NONE);
-  es_printf ("keyserver:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("reader-port:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("default-key:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("encrypt-to:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("try-secret-key:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("auto-key-locate:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("auto-key-import:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("include-key-block:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("auto-key-retrieve:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("log-file:%lu:\n", GC_OPT_FLAG_NONE);
   es_printf ("debug-level:%lu:\"none:\n", GC_OPT_FLAG_DEFAULT);
-  es_printf ("group:%lu:\n", GC_OPT_FLAG_NONE);
   es_printf ("compliance:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, "gnupg");
-  es_printf ("default-new-key-algo:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("trust-model:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("disable-dirmngr:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("max-cert-depth:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("completes-needed:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("marginals-needed:%lu:\n", GC_OPT_FLAG_NONE);
 
   /* The next one is an info only item and should match the macros at
      the top of keygen.c  */
@@ -2331,7 +2334,7 @@ main (int argc, char **argv)
     gnupg_rl_initialize ();
     set_strusage (my_strusage);
     gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
-    log_set_prefix (GPG_NAME, GPGRT_LOG_WITH_PREFIX);
+    log_set_prefix (GPG_NAME, GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY);
 
     /* Make sure that our subsystems are ready.  */
     i18n_init();
@@ -2879,10 +2882,6 @@ main (int argc, char **argv)
 		opt.force_ownertrust=0;
 	      }
 	    break;
-	  case oLoadExtension:
-            /* Dummy so that gpg 1.4 conf files can work. Should
-               eventually be removed.  */
-	    break;
 
           case oCompliance:
 	    {
@@ -3468,11 +3467,6 @@ main (int argc, char **argv)
 	      }
 	    break;
 
-	  case oStrict:
-	  case oNoStrict:
-	    /* Not used */
-            break;
-
           case oMangleDosFilenames: opt.mangle_dos_filenames = 1; break;
           case oNoMangleDosFilenames: opt.mangle_dos_filenames = 0; break;
           case oEnableProgressFilter: opt.enable_progress_filter = 1; break;
@@ -3604,6 +3598,10 @@ main (int argc, char **argv)
             mopt.forbid_gen_key = 1;
             break;
 
+          case oRequireCompliance:
+            opt.flags.require_compliance = 1;
+            break;
+
 	  case oNoop: break;
 
 	  default:
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 71adb04..4e9c35d 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -549,12 +549,14 @@ get_override_session_key (DEK *dek, const char *string)
 
 /* Stub: */
 int
-decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
+decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek,
+              int *compliance_error)
 {
   (void)ctrl;
   (void)procctx;
   (void)ed;
   (void)dek;
+  (void)compliance_error;
   return GPG_ERR_GENERAL;
 }
 
diff --git a/g10/keyedit.c b/g10/keyedit.c
index ea3bcf2..1cb62de 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -2400,6 +2400,68 @@ keyedit_quick_adduid (ctrl_t ctrl, const char *username, const char *newuid)
 }
 
 
+/* Helper to find the UID node for namehash.  On success, returns the UID node.
+   Otherwise, return NULL. */
+kbnode_t
+find_userid_by_namehash (kbnode_t keyblock, const char *namehash)
+{
+  byte hash[NAMEHASH_LEN];
+  kbnode_t node = NULL;
+
+  if (!namehash)
+    goto leave;
+
+  if (strlen (namehash) != NAMEHASH_LEN * 2)
+    goto leave;
+
+  if (hex2bin (namehash, hash, NAMEHASH_LEN) < 0)
+    goto leave;
+
+  for (node = keyblock; node; node = node->next)
+    {
+      if (node->pkt->pkttype == PKT_USER_ID)
+	{
+	  namehash_from_uid (node->pkt->pkt.user_id);
+	  if (!memcmp (node->pkt->pkt.user_id->namehash, hash, NAMEHASH_LEN))
+	    break;
+        }
+    }
+
+ leave:
+  return node;
+}
+
+
+/* Helper to find the UID node for uid.  On success, returns the UID node.
+   Otherwise, return NULL. */
+kbnode_t
+find_userid (kbnode_t keyblock, const char *uid)
+{
+  kbnode_t node = NULL;
+  size_t uidlen;
+
+  if (!keyblock || !uid)
+    goto leave;
+
+  /* First try to find UID by namehash. */
+  node = find_userid_by_namehash (keyblock, uid);
+  if (node)
+    goto leave;
+
+  uidlen = strlen (uid);
+  for (node = keyblock; node; node = node->next)
+    {
+      if (node->pkt->pkttype == PKT_USER_ID
+          && uidlen == node->pkt->pkt.user_id->len
+          && !memcmp (node->pkt->pkt.user_id->name, uid, uidlen))
+        break;
+    }
+
+ leave:
+  return node;
+}
+
+
 /* Unattended revocation of a keyid.  USERNAME specifies the
    key. UIDTOREV is the user id revoke from the key.  */
 void
@@ -2410,7 +2472,6 @@ keyedit_quick_revuid (ctrl_t ctrl, const char *username, const char *uidtorev)
   kbnode_t keyblock = NULL;
   kbnode_t node;
   int modified = 0;
-  size_t revlen;
   size_t valid_uids;
 
 #ifdef HAVE_W32_SYSTEM
@@ -2423,7 +2484,7 @@ keyedit_quick_revuid (ctrl_t ctrl, const char *username, const char *uidtorev)
   if (err)
     goto leave;
 
-  /* Too make sure that we do not revoke the last valid UID, we first
+  /* To make sure that we do not revoke the last valid UID, we first
      count how many valid UIDs there are.  */
   valid_uids = 0;
   for (node = keyblock; node; node = node->next)
@@ -2432,40 +2493,35 @@ keyedit_quick_revuid (ctrl_t ctrl, const char *username, const char *uidtorev)
                    && !node->pkt->pkt.user_id->flags.expired);
 
   /* Find the right UID. */
-  revlen = strlen (uidtorev);
-  for (node = keyblock; node; node = node->next)
+  node = find_userid (keyblock, uidtorev);
+  if (node)
     {
-      if (node->pkt->pkttype == PKT_USER_ID
-          && revlen == node->pkt->pkt.user_id->len
-          && !memcmp (node->pkt->pkt.user_id->name, uidtorev, revlen))
-        {
-          struct revocation_reason_info *reason;
-
-          /* Make sure that we do not revoke the last valid UID.  */
-          if (valid_uids == 1
-              && ! node->pkt->pkt.user_id->flags.revoked
-              && ! node->pkt->pkt.user_id->flags.expired)
-            {
-              log_error (_("cannot revoke the last valid user ID.\n"));
-              err = gpg_error (GPG_ERR_INV_USER_ID);
-              goto leave;
-            }
+      struct revocation_reason_info *reason;
 
-          reason = get_default_uid_revocation_reason ();
-          err = core_revuid (ctrl, keyblock, node, reason, &modified);
-          release_revocation_reason_info (reason);
-          if (err)
-            goto leave;
-          err = keydb_update_keyblock (ctrl, kdbhd, keyblock);
-          if (err)
-            {
-              log_error (_("update failed: %s\n"), gpg_strerror (err));
-              goto leave;
-            }
+      /* Make sure that we do not revoke the last valid UID.  */
+      if (valid_uids == 1
+          && ! node->pkt->pkt.user_id->flags.revoked
+          && ! node->pkt->pkt.user_id->flags.expired)
+        {
+          log_error (_("cannot revoke the last valid user ID.\n"));
+          err = gpg_error (GPG_ERR_INV_USER_ID);
+          goto leave;
+        }
 
-          revalidation_mark (ctrl);
+      reason = get_default_uid_revocation_reason ();
+      err = core_revuid (ctrl, keyblock, node, reason, &modified);
+      release_revocation_reason_info (reason);
+      if (err)
+        goto leave;
+      err = keydb_update_keyblock (ctrl, kdbhd, keyblock);
+      if (err)
+        {
+          log_error (_("update failed: %s\n"), gpg_strerror (err));
           goto leave;
         }
+
+      revalidation_mark (ctrl);
+      goto leave;
     }
   err = gpg_error (GPG_ERR_NO_USER_ID);
 
diff --git a/g10/keygen.c b/g10/keygen.c
index 5d8cccb..80d65c4 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -2066,8 +2066,8 @@ ask_algo (ctrl_t ctrl, int addmode, int *r_subkey_algo, unsigned int *r_usage,
           for (;;)
             {
               xfree (answer);
-              answer = tty_get (_("Enter the keygrip: "));
-              tty_kill_prompt ();
+              answer = cpr_get ("keygen.keygrip", _("Enter the keygrip: "));
+              cpr_kill_prompt ();
               trim_spaces (answer);
               if (!*answer)
                 {
@@ -5196,9 +5196,6 @@ 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);
-
 	  update_ownertrust (ctrl, pk,
                              ((get_ownertrust (ctrl, pk) & ~TRUST_MASK)
                               | TRUST_ULTIMATE ));
diff --git a/g10/main.h b/g10/main.h
index 68360e2..273ddaa 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -122,6 +122,8 @@ enum gcry_cipher_algos map_cipher_openpgp_to_gcry (cipher_algo_t algo);
 int openpgp_cipher_blocklen (cipher_algo_t algo);
 int openpgp_cipher_test_algo(cipher_algo_t algo);
 const char *openpgp_cipher_algo_name (cipher_algo_t algo);
+const char *openpgp_cipher_algo_mode_name (cipher_algo_t algo,
+                                           aead_algo_t aead);
 
 gpg_error_t openpgp_aead_test_algo (aead_algo_t algo);
 const char *openpgp_aead_algo_name (aead_algo_t algo);
diff --git a/g10/mainproc.c b/g10/mainproc.c
index b032afb..3c9ea15 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -56,6 +56,15 @@ struct kidlist_item
   int reason;
 };
 
+/* An object to build a list of symkey packet info.  */
+struct symlist_item
+{
+  struct symlist_item *next;
+  int cipher_algo;
+  int cfb_mode;
+  int other_error;
+};
+
 
 /*
  * Object to hold the processing context.
@@ -97,7 +106,9 @@ struct mainproc_context
   int trustletter;  /* Temporary usage in list_node. */
   ulong symkeys;    /* Number of symmetrically encrypted session keys.  */
   struct kidlist_item *pkenc_list; /* List of encryption packets. */
+  struct symlist_item *symenc_list; /* List of sym. encryption packets. */
   int seen_pkt_encrypted_aead; /* PKT_ENCRYPTED_AEAD packet seen. */
+  int seen_pkt_encrypted_mdc;  /* PKT_ENCRYPTED_MDC packet seen. */
   struct {
     unsigned int sig_seen:1;      /* Set to true if a signature packet
                                      has been seen. */
@@ -142,11 +153,19 @@ release_list( CTX c )
       c->pkenc_list = tmp;
     }
   c->pkenc_list = NULL;
+  while (c->symenc_list)
+    {
+      struct symlist_item *tmp = c->symenc_list->next;
+      xfree (c->symenc_list);
+      c->symenc_list = tmp;
+    }
+  c->symenc_list = NULL;
   c->list = NULL;
   c->any.data = 0;
   c->any.uncompress_failed = 0;
   c->last_was_session_key = 0;
   c->seen_pkt_encrypted_aead = 0;
+  c->seen_pkt_encrypted_mdc = 0;
   xfree (c->dek);
   c->dek = NULL;
 }
@@ -446,6 +465,11 @@ proc_symkey_enc (CTX c, PACKET *pkt)
                       if (gpg_err_code (err) != GPG_ERR_BAD_KEY
                           && gpg_err_code (err) != GPG_ERR_CHECKSUM)
                         log_fatal ("process terminated to be bug compatible\n");
+                      else
+                        write_status_text (STATUS_ERROR,
+                                           "symkey_decrypt.maybe_error"
+                                           " 11_BAD_PASSPHRASE");
+
                       if (c->dek->s2k_cacheid[0])
                         {
                           if (opt.debug)
@@ -464,6 +488,20 @@ proc_symkey_enc (CTX c, PACKET *pkt)
     }
 
  leave:
+  /* Record infos from the packet.  */
+  {
+    struct symlist_item  *symitem;
+    symitem = xcalloc (1, sizeof *symitem);
+    if (enc)
+      {
+        symitem->cipher_algo = enc->cipher_algo;
+        symitem->cfb_mode = !enc->aead_algo;
+      }
+    else
+      symitem->other_error = 1;
+    symitem->next = c->symenc_list;
+    c->symenc_list = symitem;
+  }
   c->symkeys++;
   free_packet (pkt, NULL);
 }
@@ -636,9 +674,12 @@ proc_encrypted (CTX c, PACKET *pkt)
 {
   int result = 0;
   int early_plaintext = literals_seen;
+  unsigned int compliance_de_vs = 0;
 
   if (pkt->pkttype == PKT_ENCRYPTED_AEAD)
     c->seen_pkt_encrypted_aead = 1;
+  if (pkt->pkttype == PKT_ENCRYPTED_MDC)
+    c->seen_pkt_encrypted_mdc = 1;
 
   if (early_plaintext)
     {
@@ -725,8 +766,6 @@ proc_encrypted (CTX c, PACKET *pkt)
 
   /* Compute compliance with CO_DE_VS.  */
   if (!result && is_status_enabled ()
-      /* Symmetric encryption and asymmetric encryption voids compliance.  */
-      && (c->symkeys != !!c->pkenc_list )
       /* Overriding session key voids compliance.  */
       && !opt.override_session_key
       /* Check symmetric cipher.  */
@@ -735,14 +774,26 @@ proc_encrypted (CTX c, PACKET *pkt)
                                     GCRY_CIPHER_MODE_CFB))
     {
       struct kidlist_item *i;
+      struct symlist_item *si;
       int compliant = 1;
       PKT_public_key *pk = xmalloc (sizeof *pk);
 
       if ( !(c->pkenc_list || c->symkeys) )
         log_debug ("%s: where else did the session key come from?\n", __func__);
 
-      /* Now check that every key used to encrypt the session key is
-       * compliant.  */
+      /* Check that all seen symmetric key packets use compliant
+       * algos.  This is so that no non-compliant encrypted session
+       * key can be sneaked in.  */
+      for (si = c->symenc_list; si && compliant; si = si->next)
+        {
+          if (!si->cfb_mode
+              || !gnupg_cipher_is_compliant (CO_DE_VS, si->cipher_algo,
+                                             GCRY_CIPHER_MODE_CFB))
+            compliant = 0;
+        }
+
+      /* Check that every public key used to encrypt the session key
+       * is compliant.  */
       for (i = c->pkenc_list; i && compliant; i = i->next)
         {
           memset (pk, 0, sizeof *pk);
@@ -757,15 +808,18 @@ proc_encrypted (CTX c, PACKET *pkt)
       xfree (pk);
 
       if (compliant)
-        write_status_strings (STATUS_DECRYPTION_COMPLIANCE_MODE,
-                              gnupg_status_compliance_flag (CO_DE_VS),
-                              NULL);
-
+        compliance_de_vs |= 1;
     }
 
 
   if (!result)
-    result = decrypt_data (c->ctrl, c, pkt->pkt.encrypted, c->dek );
+    {
+      int compl_error;
+      result = decrypt_data (c->ctrl, c, pkt->pkt.encrypted, c->dek,
+                             &compl_error);
+      if (!result && !compl_error)
+        compliance_de_vs |= 2;
+    }
 
   /* Trigger the deferred error.  */
   if (!result && early_plaintext)
@@ -816,9 +870,15 @@ proc_encrypted (CTX c, PACKET *pkt)
         log_info(_("decryption okay\n"));
 
       if (pkt->pkt.encrypted->aead_algo)
-        write_status (STATUS_GOODMDC);
+        {
+          write_status (STATUS_GOODMDC);
+          compliance_de_vs |= 4;
+        }
       else if (pkt->pkt.encrypted->mdc_method && !result)
-        write_status (STATUS_GOODMDC);
+        {
+          write_status (STATUS_GOODMDC);
+          compliance_de_vs |= 4;
+        }
       else
         log_info (_("WARNING: message was not integrity protected\n"));
     }
@@ -832,15 +892,22 @@ proc_encrypted (CTX c, PACKET *pkt)
     }
   else
     {
-      if ((gpg_err_code (result) == GPG_ERR_BAD_KEY
-	   || gpg_err_code (result) == GPG_ERR_CHECKSUM
-	   || gpg_err_code (result) == GPG_ERR_CIPHER_ALGO)
-          && *c->dek->s2k_cacheid != '\0')
+      if (gpg_err_code (result) == GPG_ERR_BAD_KEY
+          || gpg_err_code (result) == GPG_ERR_CHECKSUM
+          || gpg_err_code (result) == GPG_ERR_CIPHER_ALGO)
         {
-          if (opt.debug)
-            log_debug ("cleared passphrase cached with ID: %s\n",
-                       c->dek->s2k_cacheid);
-          passphrase_clear_cache (c->dek->s2k_cacheid);
+          if (c->symkeys)
+            write_status_text (STATUS_ERROR,
+                               "symkey_decrypt.maybe_error"
+                               " 11_BAD_PASSPHRASE");
+
+          if (*c->dek->s2k_cacheid != '\0')
+            {
+              if (opt.debug)
+                log_debug ("cleared passphrase cached with ID: %s\n",
+                           c->dek->s2k_cacheid);
+              passphrase_clear_cache (c->dek->s2k_cacheid);
+            }
         }
       glo_ctrl.lasterr = result;
       write_status (STATUS_DECRYPTION_FAILED);
@@ -849,6 +916,16 @@ proc_encrypted (CTX c, PACKET *pkt)
        * ways to specify the session key (symmmetric and PK). */
     }
 
+
+  /* If we concluded that the decryption was compliant, issue a
+   * compliance status before the end of the decryption status.  */
+  if (compliance_de_vs == (4|2|1))
+    {
+      write_status_strings (STATUS_DECRYPTION_COMPLIANCE_MODE,
+                            gnupg_status_compliance_flag (CO_DE_VS),
+                            NULL);
+    }
+
   xfree (c->dek);
   c->dek = NULL;
   free_packet (pkt, NULL);
@@ -860,11 +937,22 @@ proc_encrypted (CTX c, PACKET *pkt)
    * a misplace extra literal data packets follows after this
    * encrypted packet.  */
   literals_seen++;
+
+  /* The --require-compliance option allows to simplify decryption in
+   * de-vs compliance mode by just looking at the exit status.  */
+  if (opt.flags.require_compliance
+      && opt.compliance == CO_DE_VS
+      && compliance_de_vs != (4|2|1))
+    {
+      log_error (_("operation forced to fail due to"
+                   " unfulfilled compliance rules\n"));
+      g10_errors_seen = 1;
+    }
 }
 
 
 static int
-have_seen_pkt_encrypted_aead( CTX c )
+have_seen_pkt_encrypted_aead_or_mdc( CTX c )
 {
   CTX cc;
 
@@ -872,6 +960,8 @@ have_seen_pkt_encrypted_aead( CTX c )
     {
       if (cc->seen_pkt_encrypted_aead)
 	return 1;
+      if (cc->seen_pkt_encrypted_mdc)
+	return 1;
     }
 
   return 0;
@@ -953,7 +1043,7 @@ proc_plaintext( CTX c, PACKET *pkt )
         }
     }
 
-  if (!any && !opt.skip_verify && !have_seen_pkt_encrypted_aead(c))
+  if (!any && !opt.skip_verify && !have_seen_pkt_encrypted_aead_or_mdc(c))
     {
       /* This is for the old GPG LITERAL+SIG case.  It's not legal
          according to 2440, so hopefully it won't come up that often.
@@ -2532,6 +2622,15 @@ check_sig_and_print (CTX c, kbnode_t node)
         write_status_strings (STATUS_VERIFICATION_COMPLIANCE_MODE,
                               gnupg_status_compliance_flag (CO_DE_VS),
                               NULL);
+      else if (opt.flags.require_compliance
+               && opt.compliance == CO_DE_VS)
+        {
+          log_error (_("operation forced to fail due to"
+                       " unfulfilled compliance rules\n"));
+          if (!rc)
+            rc = gpg_error (GPG_ERR_FORBIDDEN);
+        }
+
 
       free_public_key (pk);
       pk = NULL;
diff --git a/g10/misc.c b/g10/misc.c
index 634d303..1d30bbc 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -608,6 +608,24 @@ openpgp_cipher_algo_name (cipher_algo_t algo)
 }
 
 
+/* Same as openpgp_cipher_algo_name but returns a string in the form
+ * "ALGO.MODE" if AEAD is not 0.  Note that in this version we do not
+ * print "ALGO.CFB" as we do in 2.3 to avoid confusing users.  */
+const char *
+openpgp_cipher_algo_mode_name (cipher_algo_t algo, aead_algo_t aead)
+{
+
+  if (aead == AEAD_ALGO_NONE)
+    return openpgp_cipher_algo_name (algo);
+
+  return map_static_strings ("openpgp_cipher_algo_mode_name", algo, aead,
+                             openpgp_cipher_algo_name (algo),
+                             ".",
+                             openpgp_aead_algo_name (aead),
+                             NULL);
+}
+
+
 /* Return 0 if ALGO is supported.  Return an error if not. */
 gpg_error_t
 openpgp_aead_test_algo (aead_algo_t algo)
diff --git a/g10/options.h b/g10/options.h
index 03b46f8..b11e91c 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -253,6 +253,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;
+    /* Fail if an operation can't be done in the requested compliance
+     * mode.  */
+    unsigned int require_compliance:1;
   } flags;
 
   /* Linked list of ways to find a key if the key isn't on the local
diff --git a/g10/packet.h b/g10/packet.h
index 187fffc..7f7608c 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -906,8 +906,9 @@ gpg_error_t get_override_session_key (DEK *dek, const char *string);
 int handle_compressed (ctrl_t ctrl, void *ctx, PKT_compressed *cd,
 		       int (*callback)(iobuf_t, void *), void *passthru );
 
-/*-- encr-data.c --*/
-int decrypt_data (ctrl_t ctrl, void *ctx, PKT_encrypted *ed, DEK *dek );
+/*-- decrypt-data.c --*/
+int decrypt_data (ctrl_t ctrl, void *ctx, PKT_encrypted *ed, DEK *dek,
+                  int *compliance_error);
 
 /*-- plaintext.c --*/
 gpg_error_t get_output_file (const byte *embedded_name, int embedded_namelen,
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 9cb254e..5fea1ac 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -188,6 +188,95 @@ mpi_read (iobuf_t inp, unsigned int *ret_nread, int secure)
 }
 
 
+/* Read an external representation (which is possibly an SOS) and
+   return the MPI.  The external format is a 16-bit unsigned value
+   stored in network byte order giving information for the following
+   octets.
+
+   The caller must set *RET_NREAD to the maximum number of bytes to
+   read from the pipeline INP.  This function sets *RET_NREAD to be
+   the number of bytes actually read from the pipeline.
+
+   If SECURE is true, the integer is stored in secure memory
+   (allocated using gcry_xmalloc_secure).  */
+static gcry_mpi_t
+mpi_read_detect_0_removal (iobuf_t inp, unsigned int *ret_nread, int secure,
+                           u16 *r_csum_tweak)
+{
+  int c, c1, c2, i;
+  unsigned int nmax = *ret_nread;
+  unsigned int nbits, nbits1, nbytes;
+  size_t nread = 0;
+  gcry_mpi_t a = NULL;
+  byte *buf = NULL;
+  byte *p;
+
+  if (!nmax)
+    goto overflow;
+
+  if ((c = c1 = iobuf_get (inp)) == -1)
+    goto leave;
+  if (++nread == nmax)
+    goto overflow;
+  nbits = c << 8;
+  if ((c = c2 = iobuf_get (inp)) == -1)
+    goto leave;
+  ++nread;
+  nbits |= c;
+  if (nbits > MAX_EXTERN_MPI_BITS)
+    {
+      log_error ("mpi too large (%u bits)\n", nbits);
+      goto leave;
+    }
+
+  nbytes = (nbits + 7) / 8;
+  buf = secure ? gcry_xmalloc_secure (nbytes + 2) : gcry_xmalloc (nbytes + 2);
+  p = buf;
+  p[0] = c1;
+  p[1] = c2;
+  for (i = 0; i < nbytes; i++)
+    {
+      if (nread == nmax)
+        goto overflow;
+
+      c = iobuf_get (inp);
+      if (c == -1)
+        goto leave;
+
+      p[i + 2] = c;
+
+      nread ++;
+    }
+
+  if (gcry_mpi_scan (&a, GCRYMPI_FMT_PGP, buf, nread, &nread))
+    a = NULL;
+
+  /* Possibly, it has leading zeros.  */
+  if (a)
+    {
+      nbits1 = gcry_mpi_get_nbits (a);
+      if (nbits > nbits1)
+        {
+          *r_csum_tweak -= (nbits >> 8);
+          *r_csum_tweak -= (nbits & 0xff);
+          *r_csum_tweak += (nbits1 >> 8);
+          *r_csum_tweak += (nbits1 & 0xff);
+        }
+    }
+
+  *ret_nread = nread;
+  gcry_free(buf);
+  return a;
+
+ overflow:
+  log_error ("mpi larger than indicated length (%u bits)\n", 8*nmax);
+ leave:
+  *ret_nread = nread;
+  gcry_free(buf);
+  return a;
+}
+
+
 /* Register STRING as a known critical notation name.  */
 void
 register_known_notation (const char *string)
@@ -2220,8 +2309,10 @@ parse_signature (IOBUF inp, int pkttype, unsigned long pktlen,
 	}
       else
 	{
-	  sig->data[0] =
-	    gcry_mpi_set_opaque (NULL, read_rest (inp, pktlen), pktlen * 8);
+          void *tmpp;
+
+          tmpp = read_rest (inp, pktlen);
+	  sig->data[0] = gcry_mpi_set_opaque (NULL, tmpp, tmpp? pktlen * 8 : 0);
 	  pktlen = 0;
 	}
     }
@@ -2429,8 +2520,10 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
   if (!npkey)
     {
       /* Unknown algorithm - put data into an opaque MPI.  */
-      pk->pkey[0] = gcry_mpi_set_opaque (NULL,
-                                         read_rest (inp, pktlen), pktlen * 8);
+      void *tmpp = read_rest (inp, pktlen);
+      /* Current gcry_mpi_cmp does not handle a (NULL,n>0) nicely and
+       * thus we avoid to create such an MPI.  */
+      pk->pkey[0] = gcry_mpi_set_opaque (NULL, tmpp, tmpp? pktlen * 8 : 0);
       pktlen = 0;
       goto leave;
     }
@@ -2694,6 +2787,8 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 	}
       else if (ski->is_protected)
 	{
+          void *tmpp;
+
 	  if (pktlen < 2) /* At least two bytes for the length.  */
 	    {
               err = gpg_error (GPG_ERR_INV_PACKET);
@@ -2703,9 +2798,10 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 	  /* Ugly: The length is encrypted too, so we read all stuff
 	   * up to the end of the packet into the first SKEY
 	   * element.  */
+
+          tmpp = read_rest (inp, pktlen);
 	  pk->pkey[npkey] = gcry_mpi_set_opaque (NULL,
-						 read_rest (inp, pktlen),
-						 pktlen * 8);
+						 tmpp, tmpp? pktlen * 8 : 0);
           /* Mark that MPI as protected - we need this information for
              importing a key.  The OPAQUE flag can't be used because
              we also store public EdDSA values in opaque MPIs.  */
@@ -2717,6 +2813,8 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 	}
       else
 	{
+          u16 csum_tweak = 0;
+
           /* Not encrypted.  */
 	  for (i = npkey; i < nskey; i++)
 	    {
@@ -2728,7 +2826,11 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
                   goto leave;
                 }
               n = pktlen;
-              pk->pkey[i] = mpi_read (inp, &n, 0);
+              if (algorithm == PUBKEY_ALGO_EDDSA)
+                pk->pkey[i] = mpi_read_detect_0_removal (inp, &n, 0,
+                                                         &csum_tweak);
+              else
+                pk->pkey[i] = mpi_read (inp, &n, 0);
               pktlen -= n;
               if (list_mode)
                 {
@@ -2749,6 +2851,7 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 	      goto leave;
 	    }
 	  ski->csum = read_16 (inp);
+          ski->csum += csum_tweak;
 	  pktlen -= 2;
 	  if (list_mode)
             es_fprintf (listfp, "\tchecksum: %04hx\n", ski->csum);
diff --git a/g10/pkclist.c b/g10/pkclist.c
index bfc4f84..82a8d3b 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -1490,9 +1490,17 @@ select_algo_from_prefs(PK_LIST pk_list, int preftype,
 	     code will never even be called.  Even if the hash wasn't
 	     locked at MD5, we don't support sign+encrypt in --pgp2
 	     mode, and that's the only time PREFTYPE_HASH is used
-	     anyway. -dms */
+	     anyway. -dms
 
-          implicit=DIGEST_ALGO_SHA1;
+             Because "de-vs" compliance does not allow SHA-1 it does
+             not make sense to assign SHA-1 as implicit algorithm.
+             Instead it is better to use SHA-256 as implicit algorithm
+             (which will be the case for rfc4880bis anyway).  */
+
+          if (opt.compliance == CO_DE_VS)
+            implicit = DIGEST_ALGO_SHA256;
+          else
+            implicit = DIGEST_ALGO_SHA1;
 
 	  break;
 
diff --git a/g10/test-stubs.c b/g10/test-stubs.c
index f0ce10b..2ae4a41 100644
--- a/g10/test-stubs.c
+++ b/g10/test-stubs.c
@@ -306,12 +306,14 @@ get_override_session_key (DEK *dek, const char *string)
 
 /* Stub: */
 int
-decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
+decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek,
+              int *compliance_error)
 {
   (void)ctrl;
   (void)procctx;
   (void)ed;
   (void)dek;
+  (void)compliance_error;
   return GPG_ERR_GENERAL;
 }
 
diff --git a/g10/trust.c b/g10/trust.c
index f7763bd..9749bd7 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
@@ -278,7 +267,11 @@ update_ownertrust (ctrl_t ctrl, PKT_public_key *pk, unsigned int new_trust)
   (void)pk;
   (void)new_trust;
 #else
+  u32 keyid[2];
+
   tdb_update_ownertrust (ctrl, pk, new_trust, 0);
+  keyid_from_pk (pk, keyid);
+  tdb_update_utk (keyid, (new_trust & TRUST_ULTIMATE));
 #endif
 }
 
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 3094bdc..1b6da96 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -192,7 +192,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;
@@ -217,7 +217,7 @@ 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
@@ -225,7 +225,7 @@ tdb_register_trusted_key (const char *string)
         {
           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;
         }
     }
@@ -257,6 +257,49 @@ add_utk (u32 *kid)
 }
 
 
+/* Add/remove KID to/from the list of ultimately trusted keys.  */
+void
+tdb_update_utk (u32 *kid, int add)
+{
+  struct key_item *k, *k_prev;
+
+  k_prev = NULL;
+  for (k = utk_list; k; k = k->next)
+    if (k->kid[0] == kid[0] && k->kid[1] == kid[1])
+      break;
+    else
+      k_prev = k;
+
+  if (add)
+    {
+      if (!k)
+        {
+          k = new_key_item ();
+          k->kid[0] = kid[0];
+          k->kid[1] = kid[1];
+          k->ownertrust = TRUST_ULTIMATE;
+          k->next = utk_list;
+          utk_list = k;
+          if ( opt.verbose > 1 )
+            log_info(_("key %s: accepted as trusted key\n"), keystr(kid));
+        }
+    }
+  else
+    {
+      if (k)
+        {
+          if (k_prev)
+            k_prev->next = k->next;
+          else
+            utk_list = NULL;
+
+          xfree (k->trust_regexp);
+          xfree (k);
+        }
+    }
+}
+
+
 /****************
  * Verify that all our secret keys are usable and put them into the utk_list.
  */
diff --git a/g10/trustdb.h b/g10/trustdb.h
index 758cfe3..595f8b2 100644
--- a/g10/trustdb.h
+++ b/g10/trustdb.h
@@ -75,13 +75,13 @@ 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);
 /* Return the list of ultimately trusted keys.  The caller must not
  * modify this list nor must it free the list.  */
 struct key_item *tdb_utks (void);
+void tdb_update_utk (u32 *kid, int add);
 void check_trustdb (ctrl_t ctrl);
 void update_trustdb (ctrl_t ctrl);
 int setup_trustdb( int level, const char *dbname );
diff --git a/g13/Makefile.am b/g13/Makefile.am
index ef5671f..b8cb342 100644
--- a/g13/Makefile.am
+++ b/g13/Makefile.am
@@ -74,7 +74,7 @@ g13_syshelp_LDADD = $(libcommon) \
 
 module_tests = t-g13tuple
 t_common_ldadd = $(libcommon) $(LIBGCRYPT_LIBS) \
-	         $(LIBASSUAN_LIBS) $(LIBICONV)
+	         $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV)
 
 t_g13tuple_SOURCES = t-g13tuple.c g13tuple.c
 t_g13tuple_LDADD = $(t_common_ldadd)
diff --git a/g13/Makefile.in b/g13/Makefile.in
index 50ee5f7..7a0a3aa 100644
--- a/g13/Makefile.in
+++ b/g13/Makefile.in
@@ -192,7 +192,8 @@ g13_syshelp_DEPENDENCIES = $(libcommon) $(am__DEPENDENCIES_1) \
 am_t_g13tuple_OBJECTS = t-g13tuple.$(OBJEXT) g13tuple.$(OBJEXT)
 t_g13tuple_OBJECTS = $(am_t_g13tuple_OBJECTS)
 am__DEPENDENCIES_2 = $(libcommon) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 t_g13tuple_DEPENDENCIES = $(am__DEPENDENCIES_2)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -328,6 +329,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
@@ -530,7 +532,7 @@ g13_syshelp_LDADD = $(libcommon) \
 
 module_tests = t-g13tuple
 t_common_ldadd = $(libcommon) $(LIBGCRYPT_LIBS) \
-	         $(LIBASSUAN_LIBS) $(LIBICONV)
+	         $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV)
 
 t_g13tuple_SOURCES = t-g13tuple.c g13tuple.c
 t_g13tuple_LDADD = $(t_common_ldadd)
diff --git a/kbx/Makefile.in b/kbx/Makefile.in
index b8525c5..c3a58cb 100644
--- a/kbx/Makefile.in
+++ b/kbx/Makefile.in
@@ -346,6 +346,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 9a2659c..b5829df 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -176,6 +176,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 1661204..56a5d07 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -1,5 +1,6 @@
 # gpg-error.m4 - autoconf macro to detect libgpg-error.
-# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
+# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020, 2021
+#               g10 Code GmbH
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,7 +10,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# Last-changed: 2014-10-02
+# Last-changed: 2021-03-31
 
 
 dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
@@ -31,7 +32,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
   dnl since that is consistent with how our three siblings use the directory/
   dnl package name in --with-$dir_name-prefix=PFX.
   AC_ARG_WITH(libgpg-error-prefix,
-              AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
+              AS_HELP_STRING([--with-libgpg-error-prefix=PFX],
                              [prefix where GPG Error is installed (optional)]),
               [gpg_error_config_prefix="$withval"])
 
@@ -61,16 +62,89 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
   fi
 
   AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
-  min_gpg_error_version=ifelse([$1], ,0.0,$1)
-  AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
+  min_gpg_error_version=ifelse([$1], ,1.33,$1)
   ok=no
-  if test "$GPG_ERROR_CONFIG" != "no" \
-     && test -f "$GPG_ERROR_CONFIG" ; then
+
+  AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH])
+  if test "$GPGRT_CONFIG" != "no"; then
+    # Determine gpgrt_libdir
+    #
+    # Get the prefix of gpgrt-config assuming it's something like:
+    #   <PREFIX>/bin/gpgrt-config
+    gpgrt_prefix=${GPGRT_CONFIG%/*/*}
+    possible_libdir1=${gpgrt_prefix}/lib
+    # Determine by using system libdir-format with CC, it's like:
+    #   Normal style: /usr/lib
+    #   GNU cross style: /usr/<triplet>/lib
+    #   Debian style: /usr/lib/<multiarch-name>
+    #   Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64
+    # It is assumed that CC is specified to the one of host on cross build.
+    if libdir_candidates=$(${CC:-cc} -print-search-dirs | \
+          sed -n -e "/^libraries/{s/libraries: =//;s/:/\\
+/g;p;}"); then
+      # From the output of -print-search-dirs, select valid pkgconfig dirs.
+      libdir_candidates=$(for dir in $libdir_candidates; do
+        if p=$(cd $dir 2>/dev/null && pwd); then
+          test -d "$p/pkgconfig" && echo $p;
+        fi
+      done)
+
+      for possible_libdir0 in $libdir_candidates; do
+        # possible_libdir0:
+        #   Fallback candidate, the one of system-installed (by $CC)
+        #   (/usr/<triplet>/lib, /usr/lib/<multiarch-name> or /usr/lib32)
+        # possible_libdir1:
+        #   Another candidate, user-locally-installed
+        #   (<gpgrt_prefix>/lib)
+        # possible_libdir2
+        #   Most preferred
+        #   (<gpgrt_prefix>/<triplet>/lib,
+        #    <gpgrt_prefix>/lib/<multiarch-name> or <gpgrt_prefix>/lib32)
+        if test "${possible_libdir0##*/}" = "lib"; then
+          possible_prefix0=${possible_libdir0%/lib}
+          possible_prefix0_triplet=${possible_prefix0##*/}
+          if test -z "$possible_prefix0_triplet"; then
+            continue
+          fi
+          possible_libdir2=${gpgrt_prefix}/$possible_prefix0_triplet/lib
+        else
+          possible_prefix0=${possible_libdir0%%/lib*}
+          possible_libdir2=${gpgrt_prefix}${possible_libdir0#$possible_prefix0}
+        fi
+        if test -f ${possible_libdir2}/pkgconfig/gpg-error.pc; then
+          gpgrt_libdir=${possible_libdir2}
+        elif test -f ${possible_libdir1}/pkgconfig/gpg-error.pc; then
+          gpgrt_libdir=${possible_libdir1}
+        elif test -f ${possible_libdir0}/pkgconfig/gpg-error.pc; then
+          gpgrt_libdir=${possible_libdir0}
+        fi
+        if test -n "$gpgrt_libdir"; then break; fi
+      done
+    else
+      # When we cannot determine system libdir-format, use this:
+      gpgrt_libdir=${possible_libdir1}
+    fi
+  else
+    unset GPGRT_CONFIG
+  fi
+
+  if test -n "$gpgrt_libdir"; then
+    GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
+    if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
+      GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
+      AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
+      gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
+    else
+      unset GPGRT_CONFIG
+    fi
+  elif test "$GPG_ERROR_CONFIG" != "no"; then
+    gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
+  fi
+  if test "$GPG_ERROR_CONFIG" != "no"; then
     req_major=`echo $min_gpg_error_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
     req_minor=`echo $min_gpg_error_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-    gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
     major=`echo $gpg_error_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
     minor=`echo $gpg_error_config_version | \
@@ -85,22 +159,34 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
         fi
     fi
   fi
+  AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
   if test $ok = yes; then
-    GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
-    GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
-    GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
-    GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
+    GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
+    GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs`
+    if test -z "$GPGRT_CONFIG"; then
+      GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null`
+      GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null`
+    else
+      GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null`
+      GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS"
+      GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null`
+      GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS"
+    fi
     AC_MSG_RESULT([yes ($gpg_error_config_version)])
     ifelse([$2], , :, [$2])
-    gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
+    if test -z "$GPGRT_CONFIG"; then
+      gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none`
+    else
+      gpg_error_config_host=`$GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none`
+    fi
     if test x"$gpg_error_config_host" != xnone ; then
       if test x"$gpg_error_config_host" != x"$host" ; then
   AC_MSG_WARN([[
 ***
-*** The config script $GPG_ERROR_CONFIG was
+*** The config script "$GPG_ERROR_CONFIG" was
 *** built for $gpg_error_config_host and thus may not match the
 *** used host $host.
-*** You may want to use the configure option --with-gpg-error-prefix
+*** You may want to use the configure option --with-libgpg-error-prefix
 *** to specify a matching config script or use \$SYSROOT.
 ***]])
         gpg_config_script_warn="$gpg_config_script_warn libgpg-error"
diff --git a/m4/ksba.m4 b/m4/ksba.m4
index 3e14e67..6b55bb8 100644
--- a/m4/ksba.m4
+++ b/m4/ksba.m4
@@ -1,5 +1,5 @@
 # ksba.m4 - autoconf macro to detect ksba
-#       Copyright (C) 2002 g10 Code GmbH
+#       Copyright (C) 2002, 2018 g10 Code GmbH
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -8,32 +8,53 @@
 # This file is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
+#
+# Last-changed: 2020-11-18
 
 dnl AM_PATH_KSBA([MINIMUM-VERSION,
 dnl              [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS
-dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
 dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUM-VERSION of 1:1.0.7 won't pass the test unless the installed
+dnl a MINIMUN-VERSION of 1:1.0.7 won't pass the test unless the installed
 dnl version of libksba is at least 1.0.7 *and* the API number is 1.  Using
-dnl this feature prevents building against newer versions of libksba
+dnl this features allows to prevent build against newer versions of libksba
 dnl with a changed API.
 dnl
 AC_DEFUN([AM_PATH_KSBA],
-[AC_REQUIRE([AC_CANONICAL_HOST])
- AC_ARG_WITH(ksba-prefix,
-            AC_HELP_STRING([--with-ksba-prefix=PFX],
-                           [prefix where KSBA is installed (optional)]),
+[ AC_REQUIRE([AC_CANONICAL_HOST])
+  dnl --with-libksba-prefix=PFX is the preferred name for this option,
+  dnl since that is consistent with how our three siblings use the directory/
+  dnl package name in --with-$dir_name-prefix=PFX.
+  AC_ARG_WITH(libksba-prefix,
+              AS_HELP_STRING([--with-libksba-prefix=PFX],
+                             [prefix where KSBA is installed (optional)]),
+     ksba_config_prefix="$withval", ksba_config_prefix="")
+
+  dnl Accept --with-ksba-prefix and make it work the same as
+  dnl --with-libksba-prefix above, for backwards compatibility,
+  dnl but do not document this old, inconsistently-named option.
+  AC_ARG_WITH(ksba-prefix,,
      ksba_config_prefix="$withval", ksba_config_prefix="")
+
   if test x$ksba_config_prefix != x ; then
-     ksba_config_args="$ksba_config_args --prefix=$ksba_config_prefix"
-     if test x${KSBA_CONFIG+set} != xset ; then
-        KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config
-     fi
+    if test x${KSBA_CONFIG+set} != xset ; then
+      KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config
+    fi
+  fi
+
+  use_gpgrt_config=""
+  if test x"$KSBA_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+    if $GPGRT_CONFIG ksba --exists; then
+      KSBA_CONFIG="$GPGRT_CONFIG ksba"
+      AC_MSG_NOTICE([Use gpgrt-config as ksba-config])
+      use_gpgrt_config=yes
+    fi
+  fi
+  if test -z "$use_gpgrt_config"; then
+    AC_PATH_PROG(KSBA_CONFIG, ksba-config, no)
   fi
 
-  AC_PATH_PROG(KSBA_CONFIG, ksba-config, no)
   tmp=ifelse([$1], ,1:1.0.0,$1)
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
      req_ksba_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
@@ -52,7 +73,11 @@ AC_DEFUN([AM_PATH_KSBA],
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
     req_micro=`echo $min_ksba_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-    ksba_config_version=`$KSBA_CONFIG $ksba_config_args --version`
+    if test -z "$use_gpgrt_config"; then
+      ksba_config_version=`$KSBA_CONFIG --version`
+    else
+      ksba_config_version=`$KSBA_CONFIG --modversion`
+    fi
     major=`echo $ksba_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
     minor=`echo $ksba_config_version | \
@@ -84,7 +109,11 @@ AC_DEFUN([AM_PATH_KSBA],
      # Even if we have a recent libksba, we should check that the
      # API is compatible.
      if test "$req_ksba_api" -gt 0 ; then
-        tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0`
+        if test -z "$use_gpgrt_config"; then
+          tmp=`$KSBA_CONFIG --api-version 2>/dev/null || echo 0`
+	else
+          tmp=`$KSBA_CONFIG --variable=api_version 2>/dev/null || echo 0`
+	fi
         if test "$tmp" -gt 0 ; then
            AC_MSG_CHECKING([KSBA API version])
            if test "$req_ksba_api" -eq "$tmp" ; then
@@ -97,15 +126,19 @@ AC_DEFUN([AM_PATH_KSBA],
      fi
   fi
   if test $ok = yes; then
-    KSBA_CFLAGS=`$KSBA_CONFIG $ksba_config_args --cflags`
-    KSBA_LIBS=`$KSBA_CONFIG $ksba_config_args --libs`
+    KSBA_CFLAGS=`$KSBA_CONFIG --cflags`
+    KSBA_LIBS=`$KSBA_CONFIG --libs`
     ifelse([$2], , :, [$2])
-    libksba_config_host=`$LIBKSBA_CONFIG $ksba_config_args --host 2>/dev/null || echo none`
+    if test -z "$use_gpgrt_config"; then
+      libksba_config_host=`$KSBA_CONFIG --host 2>/dev/null || echo none`
+    else
+      libksba_config_host=`$KSBA_CONFIG --variable=host 2>/dev/null || echo none`
+    fi
     if test x"$libksba_config_host" != xnone ; then
       if test x"$libksba_config_host" != x"$host" ; then
   AC_MSG_WARN([[
 ***
-*** The config script $LIBKSBA_CONFIG was
+*** The config script "$KSBA_CONFIG" was
 *** built for $libksba_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-libksba-prefix
diff --git a/m4/libassuan.m4 b/m4/libassuan.m4
index 004eee3..df50484 100644
--- a/m4/libassuan.m4
+++ b/m4/libassuan.m4
@@ -1,5 +1,5 @@
 dnl Autoconf macros for libassuan
-dnl       Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
 dnl
 dnl This file is free software; as a special exception the author gives
 dnl unlimited permission to copy and/or distribute it, with or without
@@ -8,23 +8,36 @@ dnl
 dnl This file is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+dnl SPDX-License-Identifier: FSFULLR
+# Last-changed: 2020-11-17
 
 dnl
 dnl Common code used for libassuan detection [internal]
 dnl Returns ok set to yes or no.
 dnl
 AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
-[ AC_ARG_WITH(libassuan-prefix,
-              AC_HELP_STRING([--with-libassuan-prefix=PFX],
+[ AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_ARG_WITH(libassuan-prefix,
+              AS_HELP_STRING([--with-libassuan-prefix=PFX],
                              [prefix where LIBASSUAN is installed (optional)]),
      libassuan_config_prefix="$withval", libassuan_config_prefix="")
   if test x$libassuan_config_prefix != x ; then
-    libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
     if test x${LIBASSUAN_CONFIG+set} != xset ; then
       LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
     fi
   fi
-  AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
+
+  use_gpgrt_config=""
+  if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+    if $GPGRT_CONFIG libassuan --exists; then
+      LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
+      AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
+      use_gpgrt_config=yes
+    fi
+  fi
+  if test -z "$use_gpgrt_config"; then
+    AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
+  fi
 
   tmp=ifelse([$1], ,1:0.9.2,$1)
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
@@ -35,55 +48,60 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
     min_libassuan_version="$tmp"
   fi
 
-  if test "$LIBASSUAN_CONFIG" != "no" ; then
-    libassuan_version=`$LIBASSUAN_CONFIG --version`
-  fi
-  libassuan_version_major=`echo $libassuan_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-  libassuan_version_minor=`echo $libassuan_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-  libassuan_version_micro=`echo $libassuan_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
-
-  AC_MSG_CHECKING(for LIBASSUAN ifelse([$2], ,,[$2 ])- version >= $min_libassuan_version)
+  AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
   ok=no
-  if test "$LIBASSUAN_CONFIG" != "no" ; then
-    ifelse([$2], ,,[if `$LIBASSUAN_CONFIG --thread=$2 2> /dev/null` ; then])
+  if test "$LIBASSUAN_CONFIG" != "no"; then
     req_major=`echo $min_libassuan_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
     req_minor=`echo $min_libassuan_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
     req_micro=`echo $min_libassuan_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-    if test "$libassuan_version_major" -gt "$req_major"; then
+
+    if test -z "$use_gpgrt_config"; then
+      libassuan_config_version=`$LIBASSUAN_CONFIG --version`
+    else
+      libassuan_config_version=`$LIBASSUAN_CONFIG --modversion`
+    fi
+    major=`echo $libassuan_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+    minor=`echo $libassuan_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+    micro=`echo $libassuan_config_version | \
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+
+    if test "$major" -gt "$req_major"; then
         ok=yes
-    else 
-        if test "$libassuan_version_major" -eq "$req_major"; then
-            if test "$libassuan_version_minor" -gt "$req_minor"; then
+    else
+        if test "$major" -eq "$req_major"; then
+            if test "$minor" -gt "$req_minor"; then
                ok=yes
             else
-               if test "$libassuan_version_minor" -eq "$req_minor"; then
-                   if test "$libassuan_version_micro" -ge "$req_micro"; then
+               if test "$minor" -eq "$req_minor"; then
+                   if test "$micro" -ge "$req_micro"; then
                      ok=yes
                    fi
                fi
             fi
         fi
     fi
-    ifelse([$2], ,,[fi])
   fi
 
   if test $ok = yes; then
-    AC_MSG_RESULT([yes ($libassuan_version)])
+    AC_MSG_RESULT([yes ($libassuan_config_version)])
   else
     AC_MSG_RESULT(no)
   fi
 
   if test $ok = yes; then
     if test "$req_libassuan_api" -gt 0 ; then
-      tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
+      if test -z "$use_gpgrt_config"; then
+        tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
+      else
+        tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
+      fi
       if test "$tmp" -gt 0 ; then
-        AC_MSG_CHECKING([LIBASSUAN ifelse([$2], ,,[$2 ])API version])
+        AC_MSG_CHECKING([LIBASSUAN API version])
         if test "$req_libassuan_api" -eq "$tmp" ; then
           AC_MSG_RESULT(okay)
         else
@@ -94,6 +112,27 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
     fi
   fi
 
+  if test $ok = yes; then
+    if test x"$host" != x ; then
+      if test -z "$use_gpgrt_config"; then
+        libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
+      else
+        libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
+      fi
+      if test x"$libassuan_config_host" != xnone ; then
+        if test x"$libassuan_config_host" != x"$host" ; then
+  AC_MSG_WARN([[
+***
+*** The config script "$LIBASSUAN_CONFIG" was
+*** built for $libassuan_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libassuan-prefix
+*** to specify a matching config script.
+***]])
+        fi
+      fi
+    fi
+  fi
 ])
 
 dnl AM_CHECK_LIBASSUAN([MINIMUM-VERSION,
@@ -120,8 +159,8 @@ dnl
 AC_DEFUN([AM_PATH_LIBASSUAN],
 [ _AM_PATH_LIBASSUAN_COMMON($1)
   if test $ok = yes; then
-    LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
-    LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
+    LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
+    LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
     ifelse([$2], , :, [$2])
   else
     LIBASSUAN_CFLAGS=""
@@ -131,45 +170,3 @@ AC_DEFUN([AM_PATH_LIBASSUAN],
   AC_SUBST(LIBASSUAN_CFLAGS)
   AC_SUBST(LIBASSUAN_LIBS)
 ])
-
-
-dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION,
-dnl                      [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGS and LIBASSUAN_PTH_LIBS
-dnl
-AC_DEFUN([AM_PATH_LIBASSUAN_PTH],
-[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
-  if test $ok = yes; then
-    LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --cflags`
-    LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --libs`
-    ifelse([$2], , :, [$2])
-  else
-    LIBASSUAN_PTH_CFLAGS=""
-    LIBASSUAN_PTH_LIBS=""
-    ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(LIBASSUAN_PTH_CFLAGS)
-  AC_SUBST(LIBASSUAN_PTH_LIBS)
-])
-
-
-dnl AM_PATH_LIBASSUAN_PTHREAD([MINIMUM-VERSION,
-dnl                           [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libassuan and define LIBASSUAN_PTHREAD_CFLAGS 
-dnl                           and LIBASSUAN_PTHREAD_LIBS
-dnl
-AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD],
-[ _AM_PATH_LIBASSUAN_COMMON($1,pthread)
-  if test $ok = yes; then
-    LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags`
-    LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs`
-    ifelse([$2], , :, [$2])
-  else
-    LIBASSUAN_PTHREAD_CFLAGS=""
-    LIBASSUAN_PTHREAD_LIBS=""
-    ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(LIBASSUAN_PTHREAD_CFLAGS)
-  AC_SUBST(LIBASSUAN_PTHREAD_LIBS)
-])
-
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index d89fe11..19d514f 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -1,5 +1,5 @@
 # libgcrypt.m4 - Autoconf macros to detect libgcrypt
-# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
+# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020 g10 Code GmbH
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,17 +9,17 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# Last-changed: 2014-10-02
+# Last-changed: 2020-09-27
 
 
 dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
 dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUM-VERSION is a string with the version number optionally prefixed
 dnl with the API version to also check the API compatibility. Example:
 dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
 dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
-dnl this feature prevents building against newer versions of libgcrypt
+dnl this features allows to prevent build against newer versions of libgcrypt
 dnl with a changed API.
 dnl
 dnl If a prefix option is not used, the config script is first
@@ -30,14 +30,26 @@ dnl
 AC_DEFUN([AM_PATH_LIBGCRYPT],
 [ AC_REQUIRE([AC_CANONICAL_HOST])
   AC_ARG_WITH(libgcrypt-prefix,
-            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
+            AS_HELP_STRING([--with-libgcrypt-prefix=PFX],
                            [prefix where LIBGCRYPT is installed (optional)]),
      libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
   if test x"${LIBGCRYPT_CONFIG}" = x ; then
      if test x"${libgcrypt_config_prefix}" != x ; then
         LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
-     else
-       case "${SYSROOT}" in
+     fi
+  fi
+
+  use_gpgrt_config=""
+  if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+    if $GPGRT_CONFIG libgcrypt --exists; then
+      LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
+      AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config])
+      use_gpgrt_config=yes
+    fi
+  fi
+  if test -z "$use_gpgrt_config"; then
+    if test x"${LIBGCRYPT_CONFIG}" = x ; then
+      case "${SYSROOT}" in
          /*)
            if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
              LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
@@ -48,11 +60,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
           *)
            AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
            ;;
-       esac
-     fi
+      esac
+    fi
+    AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
   fi
 
-  AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
   tmp=ifelse([$1], ,1:1.2.0,$1)
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
      req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
@@ -71,7 +83,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
     req_micro=`echo $min_libgcrypt_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+    if test -z "$use_gpgrt_config"; then
+      libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+    else
+      libgcrypt_config_version=`$LIBGCRYPT_CONFIG --modversion`
+    fi
     major=`echo $libgcrypt_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
     minor=`echo $libgcrypt_config_version | \
@@ -103,7 +119,11 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
      # If we have a recent libgcrypt, we should also check that the
      # API is compatible
      if test "$req_libgcrypt_api" -gt 0 ; then
-        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+        if test -z "$use_gpgrt_config"; then
+           tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+	else
+           tmp=`$LIBGCRYPT_CONFIG --variable=api_version 2>/dev/null || echo 0`
+	fi
         if test "$tmp" -gt 0 ; then
            AC_MSG_CHECKING([LIBGCRYPT API version])
            if test "$req_libgcrypt_api" -eq "$tmp" ; then
@@ -119,12 +139,16 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
     LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
     LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
     ifelse([$2], , :, [$2])
-    libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+    if test -z "$use_gpgrt_config"; then
+      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+    else
+      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none`
+    fi
     if test x"$libgcrypt_config_host" != xnone ; then
       if test x"$libgcrypt_config_host" != x"$host" ; then
   AC_MSG_WARN([[
 ***
-*** The config script $LIBGCRYPT_CONFIG was
+*** The config script "$LIBGCRYPT_CONFIG" was
 *** built for $libgcrypt_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-libgcrypt-prefix
diff --git a/m4/npth.m4 b/m4/npth.m4
index 17c2644..06cdaee 100644
--- a/m4/npth.m4
+++ b/m4/npth.m4
@@ -1,5 +1,5 @@
 # npth.m4 - autoconf macro to detect NPTH.
-# Copyright (C) 2002, 2003, 2004, 2011 g10 Code GmbH
+# Copyright (C) 2002, 2003, 2004, 2011, 2018 g10 Code GmbH
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,18 +9,35 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+# Last-changed: 2020-11-17
+
 AC_DEFUN([_AM_PATH_NPTH_CONFIG],
 [ AC_ARG_WITH(npth-prefix,
-            AC_HELP_STRING([--with-npth-prefix=PFX],
+            AS_HELP_STRING([--with-npth-prefix=PFX],
                            [prefix where NPTH is installed (optional)]),
      npth_config_prefix="$withval", npth_config_prefix="")
   if test "x$npth_config_prefix" != x ; then
       NPTH_CONFIG="$npth_config_prefix/bin/npth-config"
   fi
-  AC_PATH_PROG(NPTH_CONFIG, npth-config, no)
+
+  use_gpgrt_config=""
+  if test x"$NPTH_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+    if $GPGRT_CONFIG npth --exists; then
+      NPTH_CONFIG="$GPGRT_CONFIG npth"
+      AC_MSG_NOTICE([Use gpgrt-config as npth-config])
+      use_gpgrt_config=yes
+    fi
+  fi
+  if test -z "$use_gpgrt_config"; then
+    AC_PATH_PROG(NPTH_CONFIG, npth-config, no)
+  fi
 
   if test "$NPTH_CONFIG" != "no" ; then
-    npth_version=`$NPTH_CONFIG --version`
+    if test -z "$use_gpgrt_config"; then
+      npth_version=`$NPTH_CONFIG --version`
+    else
+      npth_version=`$NPTH_CONFIG --modversion`
+    fi
   fi
   npth_version_major=`echo $npth_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
@@ -70,31 +87,39 @@ AC_DEFUN([AM_PATH_NPTH],
     AC_MSG_RESULT(no)
   fi
   if test $ok = yes; then
-     # If we have a recent NPTH, we should also check that the
-     # API is compatible.
-     if test "$req_npth_api" -gt 0 ; then
+    # If we have a recent NPTH, we should also check that the
+    # API is compatible.
+    if test "$req_npth_api" -gt 0 ; then
+      if test -z "$use_gpgrt_config"; then
         tmp=`$NPTH_CONFIG --api-version 2>/dev/null || echo 0`
-        if test "$tmp" -gt 0 ; then
-           AC_MSG_CHECKING([NPTH API version])
-           if test "$req_npth_api" -eq "$tmp" ; then
-             AC_MSG_RESULT([okay])
-           else
-             ok=no
-             AC_MSG_RESULT([does not match. want=$req_npth_api got=$tmp])
-           fi
+      else
+        tmp=`$NPTH_CONFIG --variable=api_version 2>/dev/null || echo 0`
+      fi
+      if test "$tmp" -gt 0 ; then
+        AC_MSG_CHECKING([NPTH API version])
+        if test "$req_npth_api" -eq "$tmp" ; then
+          AC_MSG_RESULT([okay])
+        else
+          ok=no
+          AC_MSG_RESULT([does not match. want=$req_npth_api got=$tmp])
         fi
-     fi
+      fi
+    fi
   fi
   if test $ok = yes; then
     NPTH_CFLAGS=`$NPTH_CONFIG --cflags`
     NPTH_LIBS=`$NPTH_CONFIG --libs`
     ifelse([$2], , :, [$2])
-    npth_config_host=`$NPTH_CONFIG --host 2>/dev/null || echo none`
+    if test -z "$use_gpgrt_config"; then
+      npth_config_host=`$NPTH_CONFIG --host 2>/dev/null || echo none`
+    else
+      npth_config_host=`$NPTH_CONFIG --variable=host 2>/dev/null || echo none`
+    fi
     if test x"$npth_config_host" != xnone ; then
       if test x"$npth_config_host" != x"$host" ; then
         AC_MSG_WARN([[
 ***
-*** The config script $NPTH_CONFIG was
+*** The config script "$NPTH_CONFIG" was
 *** built for $npth_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-npth-prefix
diff --git a/m4/ntbtls.m4 b/m4/ntbtls.m4
index 0a30d92..55de483 100644
--- a/m4/ntbtls.m4
+++ b/m4/ntbtls.m4
@@ -8,45 +8,59 @@ dnl
 dnl This file is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+dnl
+dnl Last-changed: 2020-11-18
 
 
 dnl AM_PATH_NTBTLS([MINIMUM-VERSION,
 dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl
 dnl Test for NTBTLS and define NTBTLS_CFLAGS and NTBTLS_LIBS.
-dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
 dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
-dnl version of ntbtls is at least 1.2.5 *and* the API number is 1.  Using
-dnl this feature prevents building against newer versions of ntbtls
+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
+dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
+dnl this features allows to prevent build against newer versions of libgcrypt
 dnl with a changed API.
 dnl
 AC_DEFUN([AM_PATH_NTBTLS],
 [ AC_REQUIRE([AC_CANONICAL_HOST])
   AC_ARG_WITH(ntbtls-prefix,
-            AC_HELP_STRING([--with-ntbtls-prefix=PFX],
+            AS_HELP_STRING([--with-ntbtls-prefix=PFX],
                            [prefix where NTBTLS is installed (optional)]),
      ntbtls_config_prefix="$withval", ntbtls_config_prefix="")
   if test x"${NTBTLS_CONFIG}" = x ; then
      if test x"${ntbtls_config_prefix}" != x ; then
         NTBTLS_CONFIG="${ntbtls_config_prefix}/bin/ntbtls-config"
-     else
-       case "${SYSROOT}" in
-         /*)
-           if test -x "${SYSROOT}/bin/ntbtls-config" ; then
-             NTBTLS_CONFIG="${SYSROOT}/bin/ntbtls-config"
-           fi
-           ;;
-         '')
-           ;;
-          *)
-           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
-           ;;
-       esac
      fi
   fi
 
-  AC_PATH_PROG(NTBTLS_CONFIG, ntbtls-config, no)
+  use_gpgrt_config=""
+  if test x"${NTBTLS_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+    if $GPGRT_CONFIG ntbtls --exists; then
+      NTBTLS_CONFIG="$GPGRT_CONFIG ntbtls"
+      AC_MSG_NOTICE([Use gpgrt-config as ntbtls-config])
+      use_gpgrt_config=yes
+    fi
+  fi
+  if test -z "$use_gpgrt_config"; then
+    if test x"${NTBTLS_CONFIG}" = x ; then
+      case "${SYSROOT}" in
+        /*)
+          if test -x "${SYSROOT}/bin/ntbtls-config" ; then
+            NTBTLS_CONFIG="${SYSROOT}/bin/ntbtls-config"
+          fi
+          ;;
+        '')
+          ;;
+         *)
+          AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
+          ;;
+      esac
+    fi
+    AC_PATH_PROG(NTBTLS_CONFIG, ntbtls-config, no)
+  fi
+
   tmp=ifelse([$1], ,1:1.0.0,$1)
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
      req_ntbtls_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
@@ -65,7 +79,11 @@ AC_DEFUN([AM_PATH_NTBTLS],
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
     req_micro=`echo $min_ntbtls_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-    ntbtls_config_version=`$NTBTLS_CONFIG --version`
+    if test -z "$use_gpgrt_config"; then
+      ntbtls_config_version=`$NTBTLS_CONFIG --version`
+    else
+      ntbtls_config_version=`$NTBTLS_CONFIG --modversion`
+    fi
     major=`echo $ntbtls_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
     minor=`echo $ntbtls_config_version | \
@@ -97,7 +115,11 @@ AC_DEFUN([AM_PATH_NTBTLS],
      # If we have a recent ntbtls, we should also check that the
      # API is compatible
      if test "$req_ntbtls_api" -gt 0 ; then
-        tmp=`$NTBTLS_CONFIG --api-version 2>/dev/null || echo 0`
+        if test -z "$use_gpgrt_config"; then
+          tmp=`$NTBTLS_CONFIG --api-version 2>/dev/null || echo 0`
+        else
+          tmp=`$NTBTLS_CONFIG --variable=api_version 2>/dev/null || echo 0`
+	fi
         if test "$tmp" -gt 0 ; then
            AC_MSG_CHECKING([NTBTLS API version])
            if test "$req_ntbtls_api" -eq "$tmp" ; then
@@ -113,12 +135,16 @@ AC_DEFUN([AM_PATH_NTBTLS],
     NTBTLS_CFLAGS=`$NTBTLS_CONFIG --cflags`
     NTBTLS_LIBS=`$NTBTLS_CONFIG --libs`
     ifelse([$2], , :, [$2])
-    ntbtls_config_host=`$NTBTLS_CONFIG --host 2>/dev/null || echo none`
+    if test -z "$use_gpgrt_config"; then
+      ntbtls_config_host=`$NTBTLS_CONFIG --host 2>/dev/null || echo none`
+    else
+      ntbtls_config_host=`$NTBTLS_CONFIG --variable=host 2>/dev/null || echo none`
+    fi
     if test x"$ntbtls_config_host" != xnone ; then
       if test x"$ntbtls_config_host" != x"$host" ; then
   AC_MSG_WARN([[
 ***
-*** The config script $NTBTLS_CONFIG was
+*** The config script "$NTBTLS_CONFIG" was
 *** built for $ntbtls_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-ntbtls-prefix
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8924428..eba4c62 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,7 @@
 # List of files with translatable strings
 
 agent/call-pinentry.c
+agent/command.c
 agent/command-ssh.c
 agent/divert-scd.c
 agent/genkey.c
diff --git a/po/ca.po b/po/ca.po
index 0ae4f0a..c419373 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -155,8 +155,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr ""
 
@@ -206,13 +206,47 @@ msgstr "l'MPI és erroni"
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, 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:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "canvia la contrasenya"
+
+#: agent/command.c:2423
+#, 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:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -220,192 +254,175 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 msgid "can't create '%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, fuzzy, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "error en la creació de la contrasenya: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "canvia la contrasenya"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Introduïu el nom d'usuari: "
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Repetiu la contrasenya: "
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Repetiu la contrasenya: "
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repetiu la contrasenya: "
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "error en la creació de la contrasenya: %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "%s: error en escriure el registre de directoris: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduïu la contrasenya\n"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, 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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, 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] "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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -421,321 +438,398 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-#, fuzzy
-msgid ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
 msgstr ""
-"@\n"
-"Opcions:\n"
-" "
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "La clau ha estat substituïda"
 
-# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "detall"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "una mica més silenciós"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:192
-#, fuzzy
-msgid "use a log file for the server"
-msgstr "cerca claus en un servidor de claus"
+# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "detall"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "una mica més silenciós"
+
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:228
+# Gènere?  Nombre?  ivb
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "no és suportat"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+# Gènere?  Nombre?  ivb
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
+#: agent/gpg-agent.c:225
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "no és suportat"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
 #: agent/gpg-agent.c:244
-msgid "do not use the PIN cache when signing"
+msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:248
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:250
 #, 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:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
 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:258
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:276
 #, fuzzy
-#| msgid "not supported"
-msgid "enable ssh support"
-msgstr "no és suportat"
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|usa el mode de contrasenya especificat"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:278
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "error en la creació de la contrasenya: %s\n"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
 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:263
+#: agent/gpg-agent.c:283
 #, fuzzy
-#| msgid "not supported"
-msgid "enable putty support"
-msgstr "no és suportat"
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "utilitza el gpg-agent"
+
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 #, 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:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, 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:2374
+#: agent/gpg-agent.c:2356
 #, 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:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, 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:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, 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:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opcions:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -747,8 +841,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -756,9 +850,8 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -812,44 +905,44 @@ msgstr "Cancel·la"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "error de lectura: %s\n"
 
 # Parts?  Peces?  ivb
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "error de lectura: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -862,19 +955,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sí|si"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -887,7 +980,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -897,48 +990,48 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 #, fuzzy
 msgid "Change passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 msgid "Delete key"
 msgstr "activa una clau"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -970,7 +1063,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -988,52 +1081,52 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
@@ -1066,12 +1159,12 @@ msgstr "AV�S: el propietari és insegur en %s «%s»\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AV�S: els permissos són insegurs en %s «%s»\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
@@ -1133,22 +1226,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "AV�S: %s és una opció desaconsellada.\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1509,7 +1602,7 @@ msgstr "opcions d'importació no vàlides\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opcions d'importació no vàlides\n"
@@ -1539,19 +1632,19 @@ msgstr ""
 msgid "invalid option \"%.50s\"\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1571,41 +1664,41 @@ msgstr "no es pot obrir el fitxer: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "no s'ha trobat la clau pública %08lX: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1850,25 +1943,25 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, 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:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
@@ -1885,8 +1978,8 @@ msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1896,11 +1989,11 @@ msgstr "La vostra selecció? "
 msgid "[not set]"
 msgstr "[no establert]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
@@ -1908,221 +2001,221 @@ 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:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, 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:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2130,183 +2223,183 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2371,8 +2464,8 @@ msgid "subkey"
 msgstr "Clau pública: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
@@ -2412,26 +2505,26 @@ msgstr "no es pot usar un paquet asimètric ESK al estar en mode S2K\n"
 msgid "using cipher %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "AV�S: «%s» és un fitxer buit\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
@@ -2454,7 +2547,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AV�S: %s és una opció desaconsellada.\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2463,36 +2562,36 @@ msgstr ""
 "forçar l'algoritme de compressió %s (%d) viola les preferències del "
 "destinatari\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
 # És no-wrap?  ivb
 # Com? jm
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2500,7 +2599,7 @@ msgstr ""
 "ATENCIÓ: el missatge s'ha xifrat amb una clau feble durant el xifratge\n"
 "simètric.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problema en tractar amb un paquet xifrat\n"
@@ -2702,237 +2801,288 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 #, fuzzy
 msgid "change a passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
-msgid "create ascii armored output"
-msgstr "crea eixida amb armadura ascii"
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
+#: g10/gpg.c:596 sm/gpgsm.c:332
 #, fuzzy
-msgid "|USER-ID|encrypt for USER-ID"
+msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "no fa cap canvi"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "pregunta abans de sobreescriure"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr ""
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr ""
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
+msgid "create ascii armored output"
+msgstr "crea eixida amb armadura ascii"
+
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
 #, fuzzy
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "usa aquest id per a signar o desxifrar"
+msgid "|FILE|write output to FILE"
+msgstr "|FITXER|carrega el mòdul d'extensió especificat"
+
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "usa el mode de text canònic"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr ""
+
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
+
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr ""
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr ""
+
+#: g10/gpg.c:803 sm/gpgsm.c:324
 #, fuzzy
-msgid "|FILE|write output to FILE"
-msgstr "|FITXER|carrega el mòdul d'extensió especificat"
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "llista claus secretes"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "no fa cap canvi"
+#: g10/gpg.c:805 sm/gpgsm.c:326
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "pregunta abans de sobreescriure"
+#: g10/gpg.c:813 sm/gpgsm.c:328
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2943,7 +3093,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2973,13 +3123,13 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2999,7 +3149,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:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3007,557 +3157,557 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, 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:1627
+#: g10/gpg.c:1653
 #, 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:1630
+#: g10/gpg.c:1656
 #, 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:1636
+#: g10/gpg.c:1662
 #, 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:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, 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:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, 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:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, 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:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 #, 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:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, 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:3086
+#: g10/gpg.c:3085
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, 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:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, 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:3218
+#: g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 #, 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:3283
+#: g10/gpg.c:3282
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 #, 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:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, 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:3517
+#: g10/gpg.c:3511
 #, 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:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, 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:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AV�S: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, 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:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, fuzzy, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, 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:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, 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:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, 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:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, 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:5492
+#: g10/gpg.c:5490
 #, 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:5525
+#: g10/gpg.c:5523
 #, 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"
@@ -3571,7 +3721,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
@@ -4294,7 +4444,7 @@ msgstr "Segur que encara voleu signarla? (s/N) "
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
@@ -4494,8 +4644,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -4718,7 +4868,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
@@ -4771,7 +4921,7 @@ msgstr "Realment voleu eliminar aquest ID d'usuari? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
@@ -4859,173 +5009,173 @@ msgstr "Voleu desar els canvis? "
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Usuari inexistent.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5033,19 +5183,19 @@ msgstr ""
 "Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5055,19 +5205,19 @@ msgstr ""
 "      causar que una ID d'usuari diferent esdevinga en la primària "
 "assumida.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5076,38 +5226,38 @@ msgstr ""
 "AV�S: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
 # Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
 # Hmm. Sí... (s/N/x) jm
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5115,37 +5265,37 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "S'ha esborrat %d signatura.\n"
 msgstr[1] "S'ha esborrat %d signatura.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "L'ID d'usuari «%s» està revocat."
 msgstr[1] "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5154,43 +5304,43 @@ msgstr ""
 "AV�S: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AV�S: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5198,187 +5348,187 @@ msgid ""
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AV�S: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, 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:5784
+#: g10/keyedit.c:5840
 #, 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:5806
+#: g10/keyedit.c:5862
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 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:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5856,7 +6006,7 @@ msgstr ""
 "d'aconseguir prou entropia.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
@@ -5928,11 +6078,11 @@ msgstr "no s'ha trobat cap anell públic escrivible: %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:5213
+#: g10/keygen.c:5210
 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:5229
+#: g10/keygen.c:5226
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5942,7 +6092,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5951,7 +6101,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5959,23 +6109,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:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
@@ -6194,274 +6344,274 @@ msgstr "s'està sol·licitant la clau %08lX de %s\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AV�S: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "mida extranya per a una clau de sessió xifrada (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clau de sessió xifrada amb %s\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "xifrat amb 1 contrasenya\n"
 
 # I no serà «dades xifrades amb %s»?  ivb
 # Sembla que sí, ho marque per a mirar-ho més endavant. jm
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, 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:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AV�S: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AV�S: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, 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:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "l'algoritme de clau pública és desconegut"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
@@ -6528,32 +6678,32 @@ msgstr "error de lectura: %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AV�S: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AV�S: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AV�S: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@ -6562,7 +6712,7 @@ msgstr "AV�S: %s és una opció desaconsellada.\n"
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "No comprimit"
 
@@ -6570,32 +6720,32 @@ msgstr "No comprimit"
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "aquest missatge pot no ser usable per %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "la classe de signatura és desconeguda"
@@ -6632,24 +6782,24 @@ msgstr "s'està escrivint en stdout\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "s'asumeix que hi ha dades signades en «%s»\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AV�S: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notació de signatura crítica: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
@@ -7077,12 +7227,12 @@ msgstr "el destinatari predeterminat és desconegut «%s»\n"
 msgid "no valid addressees\n"
 msgstr "no hi ha adreces vàlides\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "clau %08lX: sense ID\n"
@@ -7531,7 +7681,7 @@ msgstr ""
 "es descarta «%s»: és una clau ElGamal generada per PGP que no és segura per "
 "a signatures!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@ -7579,7 +7729,7 @@ msgstr "error en trobar el registre de confiança: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "error de lectura: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
@@ -8097,107 +8247,107 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "«%s» no és un ID de clau llarg vàlid\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clau %08lX: s'accepta com a clau fiable\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 "la clau %08lX apareix més d'una vegada en la base de dades de confiança\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "clau %08lX: no hi ha una clau pública per a la clau fiable - es descarta\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "s'ha marcat la clau com a de confiança absoluta.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut llegir: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "el registre de confiança %lu no és del tipus demanat %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "no s'ha trobat la clau pública %08lX: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, 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:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8205,46 +8355,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 ""
 
@@ -8256,43 +8406,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 ""
 
@@ -8341,35 +8491,35 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 #, 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "canvia la contrasenya"
@@ -8437,7 +8587,7 @@ msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 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:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
@@ -8502,7 +8652,7 @@ msgstr ""
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
@@ -8649,13 +8799,13 @@ msgstr "signatura %s, algorisme de resum %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8673,81 +8823,87 @@ msgstr "canvia la contrasenya"
 msgid "|N|Initial New PIN"
 msgstr "Introduïu el nom d'usuari: "
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "no usa el terminal en absolut"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:179
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
-msgstr ""
-
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8806,7 +8962,7 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8977,7 +9133,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Certificat de revocació vàlid"
@@ -9037,7 +9193,7 @@ msgstr ""
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -9048,7 +9204,7 @@ msgstr "no forçat"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 #, fuzzy
 msgid "none"
 msgstr "no"
@@ -9095,42 +9251,37 @@ msgstr ""
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, fuzzy, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
@@ -9326,6 +9477,11 @@ msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9404,135 +9560,135 @@ msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 #, fuzzy
 msgid "list external keys"
 msgstr "llista claus secretes"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:258
-#, fuzzy
-msgid "create base-64 encoded output"
-msgstr "crea eixida amb armadura ascii"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "no usa el terminal en absolut"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:278
-msgid "never consult a CRL"
-msgstr ""
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "crea eixida amb armadura ascii"
 
-#: sm/gpgsm.c:288
-msgid "check validity using OCSP"
-msgstr ""
+#: sm/gpgsm.c:330
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr ""
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "afegeix aquest anell a la llista"
 
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:299
-msgid "do not check certificate policies"
+#: sm/gpgsm.c:354
+#, 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:372
+msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "no usa el terminal en absolut"
+#: sm/gpgsm.c:380
+msgid "check validity using OCSP"
+msgstr ""
 
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:382
+msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
-#, fuzzy
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FITXER|carrega el mòdul d'extensió especificat"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOM|usa l'algoritme de xifratge NOM"
+
+#: sm/gpgsm.c:387
+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:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "mode desatès: no pregunta mai"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "suposa «sí» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "suposa «no» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:329
-#, fuzzy
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "afegeix aquest anell a la llista"
-
-#: sm/gpgsm.c:332
-#, fuzzy
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|NOM|usa NOM com a clau secreta predeterminada"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
+#: sm/gpgsm.c:418
 #, fuzzy
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|HOST|usa aquest servidor per a cercar claus"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOM|usa l'algoritme de xifratge NOM"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9543,28 +9699,28 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, 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:1662
+#: sm/gpgsm.c:1709
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9624,7 +9780,7 @@ msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr ""
 
@@ -9654,7 +9810,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9699,23 +9855,23 @@ msgstr ""
 msgid "algorithm:"
 msgstr "armadura: %s\n"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Signatura correcta de \""
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "              alias \""
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -10524,116 +10680,140 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-msgid "run without asking a user"
-msgstr "Voleu eixir sense desar? "
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:242
+#, 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:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|HOST|usa aquest servidor per a cercar claus"
+
+#: dirmngr/dirmngr.c:271
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:227
-#, 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:279
+msgid "Configuration for OCSP"
+msgstr ""
 
-#: dirmngr/dirmngr.c:229
-msgid "|FPR|OCSP response signed by FPR"
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+#: dirmngr/dirmngr.c:285
+#, 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:287
+msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10646,80 +10826,80 @@ msgstr ""
 "@\n"
 "(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "error de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
@@ -10728,18 +10908,18 @@ 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:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "no forçat"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -10933,92 +11113,92 @@ msgstr "no s'han pogut canviar els permissos de «%s»: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 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:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Certificat correcte"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, 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:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11028,68 +11208,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, 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:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, 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:1753
+#: dirmngr/server.c:1760
 #, 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:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, 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:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11135,7 +11315,7 @@ msgstr "Certificat de revocació vàlid"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 #, fuzzy
 msgid "quiet"
 msgstr "ix"
@@ -11229,309 +11409,157 @@ msgstr "Ha fallat el procés de signatura: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr ""
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr ""
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr ""
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-
-#: tools/gpgconf-comp.c:588
-#, fuzzy
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|usa el mode de contrasenya especificat"
-
-#: tools/gpgconf-comp.c:592
-#, fuzzy
-msgid "do not allow the reuse of old passphrases"
-msgstr "error en la creació de la contrasenya: %s\n"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOM|usa NOM com a clau secreta predeterminada"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-#, fuzzy
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NOM|xifra per a NOM"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-#, fuzzy
-msgid "|URL|use keyserver at URL"
-msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "importa claus d'un servidor de claus"
-
-# «de les claus» o «de la clau»?  ivb
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-msgid "include the public key in signatures"
-msgstr "comprova les signatures de la claus"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr ""
-
-#: tools/gpgconf-comp.c:838
-#, fuzzy
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr ""
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr ""
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "error de la xarxa"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "la contrasenya és errònia"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "no s'ha trobat la clau pública"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "list global configuration file"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 #, fuzzy
 msgid "check global configuration file"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "actualitza la base de dades de confiança"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 #, fuzzy
 msgid "Component not found"
 msgstr "no s'ha trobat la clau pública"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr ""
 
@@ -11547,6 +11575,28 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "%s: error en escriure el registre de directoris: %s\n"
+
+#, fuzzy
+#~ msgid "use a log file for the server"
+#~ msgstr "cerca claus en un servidor de claus"
+
+#, fuzzy
+#~ msgid "run without asking a user"
+#~ msgstr "Voleu eixir sense desar? "
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "importa claus d'un servidor de claus"
+
+# «de les claus» o «de la clau»?  ivb
+#, fuzzy
+#~ msgid "include the public key in signatures"
+#~ msgstr "comprova les signatures de la claus"
+
+#, fuzzy
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
@@ -11688,10 +11738,6 @@ msgstr ""
 #~ msgstr "no s'ha pogut obrir %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
-
-#, fuzzy
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "error en la lectura de «%s»: %s\n"
 
@@ -13169,9 +13215,6 @@ msgstr ""
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "mai utilitza un MDC per a xifrar"
 
-#~ msgid "use the gpg-agent"
-#~ msgstr "utilitza el gpg-agent"
-
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|fitxer|escriu informació d'estat en un fitxer"
 
diff --git a/po/cs.gmo b/po/cs.gmo
index 0029a4a..288f2d1 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 4a560d1..3babfd5 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -170,8 +170,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Heslo:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "neshodují se – zkuste to znovu"
 
@@ -216,62 +216,93 @@ msgstr "Špatný PIN"
 msgid "Bad Passphrase"
 msgstr "Špatné heslo"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, 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:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Prosím, vložte toto heslo znovu"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase to protect the imported object within the "
+#| "GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Prosím, zadejte heslo, abyste ochránili importovaný objekt uvnitř systému "
+"GnuPG."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH klí�e delší než %d bitů nejsou podporovány\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "nelze vytvořit „%s“: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "nelze otevřít „%s“: %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, 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-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "nalezena karta se sériovým �íslem: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "na kartě není autentiza�ní klí� pro SSH: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nenalezen žádný vhodný klí� karty: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "chyba při získávání seznamu karet: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -280,24 +311,20 @@ msgstr ""
 "Proces SSH si vyžádal použití klí�e%%0A  %s%%0A  (%s)%%0APřejete si to "
 "povolit?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "Povolit"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "Zakázat"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Prosím, vložte heslo pro SSH klí�%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Prosím, vložte toto heslo znovu"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -306,95 +333,91 @@ msgstr ""
 "Prosím, vložte heslo, abyste ochránil(a) přijatý tajný klí�%%0A   %s%%0A   %s"
 "%%0Auvnitř úložiště klí�ů gpg-agenta"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "ze socketu se nepodařilo se vytvořit proud (stream): %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "Prosím, vložte kartu se sériovým �íslem"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "Prosím, vyjměte kartu a vložte jinou se sériovým �íslem"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "PIN správce"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Reseta�ní kód"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr "Potvr�te tla�ítkem na kartě nebo bezpe�nostním zařízení."
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr "Pro vstup použijte klávesnici �te�ky."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Zopakujte reseta�ní kód"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "Zopakujte tento PUK"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Zopakujte tento PIN"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Reseta�ní kód nebyl správně zopakován; zkuste to znovu"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK nebyl zopakován správně; zkuste to znovu"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nebyl zopakován správně; zkuste to znovu"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Prosím, vložte PIN%s%s%s, abyste odemkli kartu"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "chyba při vytváření do�asného souboru: %s\n"
-
-#: agent/genkey.c:152
-#, 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:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "chyba při zápisu do %s: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Vložte nové heslo"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "Použít přesto tento klí�"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, 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:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -403,11 +426,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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Ano, ochrana není třeba"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -415,7 +438,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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -425,160 +448,232 @@ 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:323
+#: agent/genkey.c:309
 #, 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:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Varování: Zadali jste nebezpe�né heslo."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Prosím, zadejte nové heslo"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Volby:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+#, fuzzy
+#| msgid "Options useful for debugging"
+msgid "Options used for startup"
+msgstr "Volby užite�né při ladění"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "poběží v režimu démona (na pozadí)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "poběží v režimu serveru (na popředí)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr "poběží v režimu dohledu"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "upovídaný režim"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "být o trochu víc tichý"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "neodpojovat se od konzole"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "vypisovat příkazy ve stylu sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "vypisovat příkazy ve stylu csh"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|SOUBOR|na�íst volby ze SOUBORU"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "neodpojovat se od konzole"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Volby ovlivňující diagnostický výstup"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "použít pro server soubor s protokolem"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "upovídaný režim"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "být o trochu víc tichý"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
+
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Volby ovlivňující nastavení"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "nepoužívat SCdémona"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
+
+#: agent/gpg-agent.c:213
 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorovat požadavky na změnu TTY"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorovat požadavky na změnu X displeje"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "zapnout podporu pro OpenSSH"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|ALGORITMUS|ukazovat otisky SSH pomocí ALGORITMU"
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "zapnout podporu pro PuTTY"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Volby ovlivňující bezpe�nost"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|zahodit zapamatované PINy po N sekundách"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|zahazovat klí�e SSH po N sekundách"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|nastavit maximální životnost do�asné paměti pro PINy na N sekund"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N| nastavit maximální životnost klí�ů SSH na N sekund"
+
+#: agent/gpg-agent.c:248
 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:250
 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:252
 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:257
 msgid "allow presetting passphrase"
 msgstr "umožnit přednastavení hesla"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Volby vynucující politiku hesel"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "nedovolit obejití politiky hesel"
+
+#: agent/gpg-agent.c:267
+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:269
+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:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|SOUBOR|prověřovat nová hesla proti vzorům v SOUBORU"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|omezit platnost hesla na N dnů"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "nedovolit opakovat stará hesla"
+
+#: agent/gpg-agent.c:281
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the PIN-Entry"
+msgstr "Volby ovlivňující bezpe�nost"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
+msgstr ""
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr "znemožnit volajícímu přebít pinentry"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
-msgstr "umožnit zadání hesla skrze Emacs"
+#: agent/gpg-agent.c:287
+#, 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:258
-msgid "enable ssh support"
-msgstr "zapnout podporu pro OpenSSH"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "|ALGORITMUS|ukazovat otisky SSH pomocí ALGORITMU"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|nastavit �asový limit pro Pinentry na N sekund"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "zapnout podporu pro PuTTY"
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Použití: @GPG_AGENT@ [volby] (-h pro nápovědu)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -586,135 +681,143 @@ msgstr ""
 "Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
 "Správa tajných klí�ů pro @GNUPG@\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "zadána neplatná úroveň ladění „%s“\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "�tou se možnosti z „%s“\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "socket nelze vytvořit: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "název socketu „%s“ je příliš dlouhý\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, 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:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, 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:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "naslouchá se na socketu „%s“\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "nelze vytvořit adresář „%s“: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "adresář „%s“ vytvořen\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "volání stat() na „%s“ selhalo: %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "„%s“ nelze použít jako domovský adresář\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, 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:2739
+#: agent/gpg-agent.c:2721
 #, 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:2744
+#: agent/gpg-agent.c:2726
 #, 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:2819
+#: agent/gpg-agent.c:2801
 #, 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:2824
+#: agent/gpg-agent.c:2806
 #, 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:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect selhala: %s – �eká se 1 s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s pozastaveno\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "v této relaci neběží žádný gpg-agent\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Volby:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Použití: gpg-preset-passphrase [volby] KEYGRIP (-h pro nápovědu)\n"
@@ -727,8 +830,8 @@ msgstr ""
 "Syntaxe: gpg-preset-passphrase [volby] KEYGRIP\n"
 "Správa do�asné paměti pro hesla\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -736,9 +839,8 @@ msgstr ""
 "@Příkazy:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -794,43 +896,43 @@ msgstr "zrušeno\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba při ptaní se na heslo: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "chyba při otevírání „%s“: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "soubor „%s“, řádek %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "ignorováno sdělení „%s“ z „%s“, řádku %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "systémový důvěryhodný seznam „%s“ není dostupný\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "chybný otisk v „%s“, řádek %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "neplatný příznak klí�e v „%s“, řádek %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "chyba při �tení „%s“, řádek %d: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "chyba při �tení seznamu důvěryhodných kořenových certifikátů\n"
@@ -843,7 +945,7 @@ msgstr "chyba při �tení seznamu důvěryhodných kořenových certifikátů\n
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -852,11 +954,11 @@ msgstr ""
 "Věříte bezmezně, že%%0A  „%s“%%0Ařádně ověřuje identitu uživatele při "
 "vydávání certifikátu?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Ano"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "Ne"
@@ -869,7 +971,7 @@ msgstr "Ne"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -880,35 +982,35 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "V pořádku"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "Å patnÄ›"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Poznámka: Toto heslo nikdy nebylo změněno.%0AProsím, nyní jej změňte."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr "Toto heslo se nezměnilo%%0Aod %.4s-%.2s-%.2s. Prosím, nyní jej změňte."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Změnit heslo"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "Změním jej později"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -916,11 +1018,11 @@ msgid ""
 msgstr ""
 "Opravdu chcete smazat klí� ur�ený pomocí keygripu%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "Smazat klí�"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -953,7 +1055,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, 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"
@@ -968,52 +1070,52 @@ msgstr "ochranný algoritmus %d (%s) není podporován\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "ochranný algoritmus %d (%s) není podporován\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba při vytváření roury: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "chyba při vytváření proudu pro rouru: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba při rozdvojování procesu: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "�ekání na konec procesu %d se nezdařilo: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "chyba při spouštění „%s“: pravděpodobně není nainstalován\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "chyba v běhu „%s“: návratový kód %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "chyba v běhu „%s“: násilně ukon�eno\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "�ekání na ukon�ení procesu se nezdařilo: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba při získání návratového kódu procesu %d: %s\n"
@@ -1045,12 +1147,12 @@ msgstr "Varování: vlastnictví %s „%s“ není nastaveno bezpe�ně\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varování: přístupová práva %s „%s“ nejsou bezpe�ná\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "�ekání, až se soubor „%s“ stane přístupným…\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "přejmenování „%s“ na „%s“ se nezdařilo: %s\n"
@@ -1110,22 +1212,22 @@ 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:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "chyba při alokování dostate�ného množství paměti: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: zastaralý parametr „%s“ – neú�inkuje\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROV�N�: „%s%s“ je zastaralý parametr – neú�inkuje\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "neznámý ladicí příznak „%s“ se ignoruje\n"
@@ -1431,7 +1533,7 @@ msgstr "neplatný parametr"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "postrádám argument u volby „%.50s“\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "neplatný argument u volby „%.50s“\n"
@@ -1461,17 +1563,17 @@ msgstr "příkaz „%.50s“ není jednozna�ný\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "neplatný parametr „%.50s“\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "Poznámka: neexistuje implicitní soubor s možnostmi „%s“\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "soubor s možnostmi „%s“: %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1491,42 +1593,42 @@ msgstr "iconv_open selhala: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "převod z „%s“ na „%s“ se nezdařil: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "nebylo možné vytvořit do�asný soubor „%s“: %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "chyba při zápisu do „%s“: %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "odstraňuji starý zamykací soubor (vytvořil %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "�ekám na zámek (drží ho %d%s) %s…\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(uváznutí?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "zámek „%s“ nebyl vytvořen: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "�ekám na zámek %s…\n"
 
 # První argument je název knihovny
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, 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"
@@ -1753,22 +1855,22 @@ msgstr "nepřijatelné přesměrování HTTP serverem bylo odklizeno"
 msgid "server uses an invalid certificate"
 msgstr "server používá neplatný certifikát"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, c-format
 msgid "Note: %s\n"
 msgstr "Poznámka: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, 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:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1784,8 +1886,8 @@ msgstr "Tento příkaz je dostupný pouze pro karty verze 2\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1795,120 +1897,120 @@ msgstr "Váš výběr? "
 msgid "[not set]"
 msgstr "[není nastaveno]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr "Pan"
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr "Paní"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "není vyžadováno"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "vyžadováno"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 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:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak „<“ nelze použít.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: Více mezer není povoleno.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Příjmení držitele karty: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Jméno (křestní) držitele karty: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "URL pro získání veřejného klí�e: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "chyba při �tení „%s“: %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "chyba při zápisu do „%s“: %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Login (jménu ú�tu): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Privátní DO data: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Jazykové předvolby: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatná délka řetězce s předvolbami.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatný znak v řetězci s předvolbami\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Oslovení (M = Pan, F = Paní, nebo mezera): "
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatná odpově�.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "Otisk CA: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: chybně utvořené otisk.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s klí�em není možná: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "toto není OpenPGP karta"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Přepsat existující klí�? (a/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1919,97 +2021,97 @@ msgstr ""
 "dokumentace\n"
 "          své karty, kde se dozvíte, jaké velikosti jsou dovoleny.\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou délku klí�e si přejete? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bitů\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "velikost klí�e %s musí být v intervalu %u-%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr "Mění se atribut kartového klí�e pro: "
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 msgid "Signature key\n"
 msgstr "Podepisovací klí�\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 msgid "Encryption key\n"
 msgstr "Šifrovací klí�\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr "Autentiza�ní klí�\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosím, vyberte druh klí�e, který chcete:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Neplatný výběr.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, 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:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 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:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Přepsat existující klí�e? (a/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2020,166 +2122,166 @@ msgstr ""
 "   PIN = „%s“     PIN správce = „%s“\n"
 "Měli byste je změnit příkazem --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 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:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovací klí�\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Šifrovací klí�\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�ní klí�\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "Prosím vyberte, kam uložit klí�:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Volání KEYTOCARD selhalo: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr "Pokra�ovat (a/N) "
 
 # The code expects non-localized "yes"
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Opravdu obnovit tovární nastavení (zadejte „yes“) "
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "chyba při nastavování KDF: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "zobraz příkazy správce"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "ukázat tuto pomoc"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "vypiš všechna dostupná data"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "změní jméno majitele karty"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "změní URL pro získání klí�e"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "získá klí� specifikovaný v URL karty"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "změnit login name"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "změnit jazykové předvolby"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr "změní oslovení držitele karty"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "vypsat otisk certifika�ní autority"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 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:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "vytvořit nový pár klí�ů"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "nabídka pro změnu anebo odblokování PINu"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "ověř PIN a vypiš všechna data"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "odblokovat PIN pomocí reseta�ního kódu"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr "zni�it všechny klí�e a data"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr "nastavit KDF pro autentizaci kódem PIN"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 msgid "change the key attribute"
 msgstr "změnit atribut klí�e"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/karta> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "pouze příkazy správce\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "příkazy správce jsou povoleny\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "příkazy správce nejsou povoleny\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný příkaz (zkuste „help“)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento příkaz není platný\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "„%s“ nelze otevřít\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klí� „%s“ nenalezen: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2243,8 +2345,8 @@ msgid "subkey"
 msgstr "podklí�e"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
@@ -2285,24 +2387,24 @@ msgstr "v režimu S2K nelze použít symetrický ESK paket\n"
 msgid "using cipher %s\n"
 msgstr "použití šifry: %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "„%s“ je již zkomprimován\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "VAROV�N�: soubor „%s“ je prázdný\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "šifrovací algoritmus „%s“ se nesmí používat v režimu %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "hashovací algoritmus „%s“ se nesmí používat v režimu %s\n"
@@ -2324,7 +2426,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROV�N�: klí� %s není vhodný pro šifrování v režimu %s\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2333,38 +2441,38 @@ msgstr ""
 "VAROV�N�: vyžádaný komprima�ní algoritmus %s (%d) nevyhovuje předvolbám "
 "příjemce\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zašifrovaný pro: „%s“\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "volba „%s“ se nesmí používat v režimu %s\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s zašifrovaná data\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "zašifrováno neznámým algoritmem %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "VAROV�N�: zpráva byla zašifrována slabým klí�em v symetrické šifře.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problém se zašifrovaným paketem\n"
@@ -2549,214 +2657,272 @@ msgstr "Neplatný klí� %s změněn na platný pomocí --always-non-selfsigned-
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "používám podklí� %s místo primárního klí�e %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "platné hodnoty pro volbu „%s“:\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "vytvořit podpis"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "vytvořit podpis v �itelném dokumentu"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "vytvořit podpis oddělený od dokumentu"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "Å¡ifrovat data"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "šifrování pouze se symetrickou šifrou"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "dešifrovat data (implicitně)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "vypsat seznam klí�ů"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "vypsat seznam klí�ů a podpisů"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy klí�ů"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam klí�ů a otisků"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "vypsat seznam tajných klí�ů"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "vytvořit nový pár klí�ů"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "rychle vytvořit nový pár klí�ů"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr "rychle přidat novou identitu uživatele"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr "rychle odvolat identitu uživatele"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr "rychle nastavit nové datum konce platnosti"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "komplexní vytvoření páru klí�ů"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "vytvořit revoka�ní certifikát"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "odstranit klí� ze souboru veřejných klí�ů"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "odstranit klí� ze souboru tajných klí�ů"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "rychle podepsat klí�"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "rychle lokálně podepsat klí�"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "rychle odvolat identitu uživatele"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "podepsat klí�"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "podepsat klí� lokálně"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat klí�"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "změnit heslo"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "exportovat klí�e"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "exportovat klí�e na server klí�ů"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importovat klí�e ze serveru klí�ů"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "vyhledat klí�e na serveru klí�ů"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat všechny klí�e ze serveru klí�ů"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importovat/slou�it klí�e"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "změnit data na kartě"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "změnit PIN karty"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "aktualizovat databázi důvěry"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "vypsat hash zprávy"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "pracovat v režimu serveru"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|HODNOTA|nastavit TOFU politiku klí�i"
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|N�ZEV|použít N�ZEV jako implicitní tajný klí�"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|JMÉNO|šifrovat rovněž pro uživatele s ID JMÉNO"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|nastavit e-mailový alias"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "použít chování striktně podle OpenPGP"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "neprovádět žádné změny"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "vyžádat potvrzení před přepsáním"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the input"
+msgstr "Volby ovlivňující bezpe�nost"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+#, fuzzy
+#| msgid "Options controlling the diagnostic output"
+msgid "Options controlling the output"
+msgstr "Volby ovlivňující diagnostický výstup"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "vytvořit výstup zapsaný v ASCII"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|SOUBOR|zapsat výstup do SOUBORU"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-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:726
+msgid "use canonical text mode"
+msgstr "použít kanonický textový režim"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "použít kanonický textový režim"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+#, fuzzy
+#| msgid "Options controlling the interactivity and enforcement"
+msgid "Options controlling key import and export"
+msgstr "Volby ovlivňující interaktivitu a vymáhání"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|SOUBOR|zapsat výstup do SOUBORU"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|METODA|používat METODU pro dohledávání klí�ů podle e-mailové adresy"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "neprovádět žádné změny"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "zakázat veškerý přístup k dirmngr"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "vyžádat potvrzení před přepsáním"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+#, fuzzy
+#| msgid "Options controlling the configuration"
+msgid "Options controlling key listings"
+msgstr "Volby ovlivňující nastavení"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "použít chování striktně podle OpenPGP"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "vypsat seznam tajných klí�ů"
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:813 sm/gpgsm.c:328
+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:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2764,7 +2930,7 @@ msgstr ""
 "@\n"
 "(Pro úplný seznam všech příkazů a voleb nahlédněte do manuálové stránky.)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2784,11 +2950,11 @@ msgstr ""
 " --list-keys [jména]        ukázat klí�e\n"
 " --fingerprint [jména]      ukázat otisky\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2798,7 +2964,7 @@ msgstr ""
 "Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
 "Výchozí operace závisí na vstupních datech.\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2806,79 +2972,79 @@ msgstr ""
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Veřejný klí�: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Å ifra: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "použití: %s [přepína�e] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "konfliktní příkazy\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = podpis nalezen v definici skupiny „%s“\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, 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:1627
+#: g10/gpg.c:1653
 #, 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:1630
+#: g10/gpg.c:1656
 #, 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:1636
+#: g10/gpg.c:1662
 #, 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:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, 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:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2886,21 +3052,21 @@ msgstr ""
 "VAROV�N�: vlastnictví adresáře „%s“ s konfigura�ním souborem není nastaveno "
 "nebezpe�ně\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2908,7 +3074,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:1666
+#: g10/gpg.c:1692
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
@@ -2916,449 +3082,449 @@ msgstr ""
 "nastavena bezpe�ně\n"
 
 # c-format
-#: g10/gpg.c:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "neznámá konfigura�ní položka „%s“\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "zobrazovat ID fotografií během výpisu klí�ů"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "ukazovat údaje o ú�elu klí�e při výpisu klí�ů"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "ukazovat URL politik během výpisu podpisů"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "ukazovat všechny poznámky během výpisu podpisů"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 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:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "ukazovat platnost ID uživatelů při výpisu klí�ů"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 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:2024
+#: g10/gpg.c:2027
 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:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "ukazovat název souboru s klí�i při výpisu klí�ů"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "ukazovat data expirace během výpisu podpisů"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "neznámá TOFU politika „%s“\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(možnosti lze vypsat příkazem „help“)\n"
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento příkaz není v režimu %s dovolen.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "„%s“ není platná doba expirace podpisu\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "„%s“ není správná e-mailová adresa\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "neplatný režim pinentry „%s“\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "neplatný původ požadavku „%s“\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "„%s“ není platná znaková sada\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru klí�ů\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parametr pro server klí�ů\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "neplatný parametr pro server klí�ů\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parametr pro import\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "neplatný parametr pro import\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "neplatná volba filtru: %s\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parametr pro export\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "neplatný parametr pro export\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "zobrazovat ID fotografií při ověřování podpisu"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "ukazovat URL politik při ověřování podpisu"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "ukazovat všechny poznámky při ověřování podpisu"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 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:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 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:3287
+#: g10/gpg.c:3286
 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:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "ověřovat podpisy s daty PKA"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, 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:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s přepíše %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Není dovoleno používat %s s %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedává s %s smysl!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "VAROV�N�: pracuji s podvrženým systémovým �asem: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný kompresní algoritmus je neplatný\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, 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:3839
+#: g10/gpg.c:3837
 #, 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:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatná minimální úroveň certifikace (min-cert-level); musí být 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Poznámka: jednoduchý režim S2K (0) je důrazně nedoporu�ován\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatný režim S2K; musí být 0, 1 nebo 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "neplatné implicitní předvolby\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné uživatelské předvolby pro šifrování\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné uživatelské předvolby pro hashování\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné uživatelské předvolby pro komprimaci\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud není funk�ní s %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat databázi důvěry: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odeslání na keyserver se nezdařilo: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "získání dat z serveru klí�ů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export klí�e se nepodařil: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export jako SSH klí� se nepodařil: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hledání na serveru klí�ů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "obnovení dat na serveru klí�ů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódování z ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódování do ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus „%s“\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "chyba při rozboru názvu klí�e „%s“: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, 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:5134
+#: g10/gpg.c:5132
 #, 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:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�něte psát svou zprávu…\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pro certifika�ní politiku je neplatné\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pro podepisovací politiku je neplatné\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL preferovaného serveru klí�ů je neplatné\n"
@@ -3371,7 +3537,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
@@ -4081,7 +4247,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jistý(á), že stále chcete podepsat tento klí�? (a/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
@@ -4256,8 +4422,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:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podepsání selhalo: %s\n"
@@ -4449,7 +4615,7 @@ msgstr ""
 "  s „t“ pro důvěryhodný podpis (tsign) nebo „nr“ pro neodvolatelný\n"
 "  podpis (nrsign) nebo libovolnou jejich kombinací (ltsign, tnrsign, atd.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Klí� je odvolán."
 
@@ -4497,7 +4663,7 @@ msgstr "Opravdu odstranit tento id uživatele? (a/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu přesunout primární klí�? (a/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybrat právě jeden klí�.\n"
 
@@ -4573,162 +4739,162 @@ msgstr "Uložit změny? (a/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez uložení? (a/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Klí� nebyl změněn, takže není potřeba jej aktualizovat.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "poslední platné ID uživatele nelze odvolat.\n"
 
-#: g10/keyedit.c:2476
+#: g10/keyedit.c:2532
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "odvolání ID uživatele se nepodařilo: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "nastavení primárního ID uživatele se nepodařilo: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "„%s“ není otisk\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "„%s“ není primární otisk\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Neplatné ID uživatele „%s“: %s\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "Žádný identifikátor uživatele neodpovídá."
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "Nic na podepsání.\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nepodepsáno vámi.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "kontrola vytvořeného podpisu se nepodařila: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "„%s“ není platná doba expirace\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "„%s“ není řádný otisk\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "podklí� „%s“ nenalezen\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Preferovaný keyserver: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Poznámky: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Uživatelský ID formátu PGP 2.x nemá žádné předvolby\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "V %s byl následující klí� odvolán %s klí�em %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento klí� může být odvolán %s klí�em %s "
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(citlivá informace)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "vytvořen: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "odvolán: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon�í: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "použití: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "�íslo karty: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "důvěra: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Tento klí� byl ozna�en za neplatný (disabled)"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4737,17 +4903,17 @@ msgstr ""
 "být nutně správné, dokud znova nespustíte program.\n"
 
 # status
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "odvolán"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4756,17 +4922,17 @@ msgstr ""
 "VAROV�N�: žádné uživatelské ID nebylo ozna�eno jako primární.  Tento příkaz\n"
 "              může způsobit, že za primární bude považováno jiné user ID.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "POZOR: Vašemu šifrovacímu podklí�i brzy vyprší platnost.\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Dobu platnosti také můžete změnit.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4775,35 +4941,35 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 klí�. Přidání fotografického ID může v některých\n"
 "         verzích PGP vést k odmítnutí tohoto klí�e.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jistý, že jej chcete stále přidat? (a/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Takový identifikátor uživatele již u tohoto klí�e existuje!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento neznámý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4811,20 +4977,20 @@ msgstr[0] "Smazán %d podpis.\n"
 msgstr[1] "Smazány %d podpisy.\n"
 msgstr[2] "Smazáno %d podpisů.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smazáno.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "neplatný"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4832,17 +4998,17 @@ msgstr[0] "Uživatelské ID „%s“: odstraněn %d podpis\n"
 msgstr[1] "Uživatelské ID „%s“: odstraněny %d podpisy\n"
 msgstr[2] "Uživatelské ID „%s“: odstraněno %d podpisů\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uživatelské ID „%s“: je již minimalizované\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uživatelské ID „%s“: je již odstraněné\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4851,210 +5017,210 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 klí�. Přidání pověřeného odvolatele může v některých\n"
 "          verzích PGP vést k odmítnutí tohoto klí�e.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "K PGP2 klí�i byste neměli přidávat pověřeného odvolatele.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vložte identifikátor pověřeného odvolatele: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klí� formátu PGP 2.x nelze pověřit odvoláním\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "klí� nelze pověřit odvoláním sama sebe\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento klí� již byl ur�en jako odvolatel\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "VAROV�N�: ustanovení klí�e pověřeným odvolatelem je nevratná operace!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jistí, že tento klí� chcete pověřit odvoláním? (a/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Jste si jistí, že chcete změnit dobu expirace více podklí�ům? (a/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Měním dobu expirace podklí�e.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Měním dobu expirace primárního klí�e.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nemůžete změnit dobu platnosti klí�e verze 3\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 msgid "Changing usage of a subkey.\n"
 msgstr "Mění se ú�el podklí�e.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 msgid "Changing usage of the primary key.\n"
 msgstr "Mění se ú�el primárního klí�e.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podepisovací podklí� %s je již křížově certifikován\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "podklí� %s nepodepisuje, a tak není třeba jej křížově certifikovat\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte právě jeden id uživatele .\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "přesko�en v3 podpis klí�e jím samým u uživatelského id „%s“\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vložte URL preferovaného serveru klí�ů: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 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:5344
+#: g10/keyedit.c:5400
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Vložte poznámku: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Pokra�ovat (a/N)? "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje uživatelské ID s hashem %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Neexistuje podklí� s ID klí�e „%s“.\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podklí� s indexem %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID uživatele: „%s“\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (neexportovatelné)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvořit pro tento podpis odvolací certifikát? (a/N)"
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (neodvolatelné)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, 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:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte se odvolat tyto podpisy:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvořit odvolací certifikáty? (a/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "neexistuje tajný klí�\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "pokus odvolat ID neuživatele: %s\n"
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "uživatelské ID „%s“ je již odvoláno\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Poslední platné ID uživatele nelze odvolat.\n"
 
-#: g10/keyedit.c:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klí� %s je již odvolán.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklí� %s je již odvolán.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5517,7 +5683,7 @@ msgstr ""
 "entropie.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvoření klí�e se nepodařilo: %s\n"
@@ -5586,11 +5752,11 @@ msgstr "nenalezen zapisovatelný soubor veřejných klí�ů (pubring): %s\n"
 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:5213
+#: g10/keygen.c:5210
 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:5229
+#: g10/keygen.c:5226
 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"
@@ -5598,7 +5764,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5606,7 +5772,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:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5614,22 +5780,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:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvořit? (a/N) "
 
@@ -5844,86 +6010,86 @@ msgstr "požaduje se klí� z „%s“\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROV�N�: URI %s nelze získat: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "podivná velikost šifrovacího klí�e pro sezení (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s zašifrovaný klí� sezení\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "heslo (passphrase) generováno s použitím neznámého algoritmu %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "veřejný klí� je %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, 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:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "zašifrována %u-bitovým %s klí�em, ID %s, vytvořeným %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      „%s“\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zašifrováno %s klí�em, ID %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dešifrování veřejným klí�em selhalo: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "VAROV�N�: zachyceno více prostých textů\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zašifrováno s heslem %lu\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zašifrováno jedním heslem\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "předpokládám %s šifrovaných dat\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, 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:796
+#: g10/mainproc.c:850
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5932,182 +6098,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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Dešifrování lze vynutit volbou „%s“.\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "vynucené dešifrování selhalo!\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "dešifrování o.k.\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, 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:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dešifrování selhalo: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "původní jméno souboru='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "nenalezen žádná podpis\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ŠPATN� podpis od „%s“"
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypršenou platností od „%s“"
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobrý podpis od „%s“"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, 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:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvořen %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               použití %s klí�e %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               vydavatel „%s“\n"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Klí� k dispozici na: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, 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:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[nejistý]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias „%s“"
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�í %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "podpis %s, hashovací algoritmus %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binární formát"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "textový formát"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "neznámý formát"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ", algoritmus klí�e"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, 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:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ověřit podpis: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "toto není podpis oddělený od dokumentu\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatný podpis třídy 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starého typu (PGP 2.x)\n"
@@ -6174,69 +6340,69 @@ msgstr "(nahlášená chyba: %s <%s>)\n"
 msgid "(further info: "
 msgstr "(podrobnosti: "
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: použití parametru „%s“ se nedoporu�uje\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: používání parametru „%s“ se nedoporu�uje\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "použijte místo něj „%s%s“ \n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: používání příkaz „%s“ se nedoporu�uje - nepoužívejte jej\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: „%s“ je v tomto souboru zastaralý – ú�inkuje pouze v %s\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "VAROV�N�: „%s%s“ je zastaralý parametr – neú�inkuje kromě v %s\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Nezkomprimováno"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "nezkomprimováno|nic"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "tato zpráva nemusí být s %s použitelná\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "nejednozna�ná volba „%s“\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "neznámá volba „%s“\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "U veřejného klí�e ECDSA se o�ekává, že v kódování SEC bude délka násobkem 8 "
 "bitů\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "neznámý slabý hashovací algoritmus „%s“\n"
@@ -6269,22 +6435,22 @@ msgstr "zapisuji do standardního výstupu\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "v „%s“ se předpokládají podepsaná data\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemohu pracovat s algoritmem veřejného klí�e %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROV�N�: potencionálně nebezpe�ně symetricky zašifrován klí� sezení\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Neznámá kritická notace podpisu: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpacket typu %d má nastavený kritický bit\n"
@@ -6692,12 +6858,12 @@ msgstr "neznámý implicitní adresát „%s“\n"
 msgid "no valid addressees\n"
 msgstr "žádné platné adresy\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Poznámka: klí�i %s chybí vlastnost %s\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Poznámka: klí�i %s chybí předvolby pro %s\n"
@@ -7143,7 +7309,7 @@ msgstr ""
 "toto je PGP klí� vygenerovaný podle algoritmu Elgamal,\n"
 "podpisy vytvořené tímto klí�em nejsou bezpe�né!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "záznam důvěry %lu, typ %d: zápis selhal: %s\n"
@@ -7188,7 +7354,7 @@ msgstr "chyba při hledání záznamu důvěryhodnosti v „%s“: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "chyba při �tení v „%s“: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "databáze důvěry: synchronizace selhala %s\n"
@@ -7725,93 +7891,93 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "„%s“ není platný dlouhý keyID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "klí� %s: akceptován jako důvěryhodný klí�\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "klí� %s se v databázi důvěry vyskytuje více než jednou\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "klí� %s: nenalezen veřejný klí� k důvěryhodnému klí�i – přesko�eno\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "klí� %s ozna�en jako absolutně důvěryhodný.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "záznam důvěry %lu, typ pož. %d: �tení selhalo: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "záznam důvěry %lu není požadovaného typu %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "Databázi důvěry můžete zkusit znovu vytvořit pomocí těchto příkazů:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Pokud to nebude fungovat, prosím, nahlédněte do návodu\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nelze použít neznámý model důvěry (%d) – předpokládáme použití modelu %s\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "použití modelu důvěry %s\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "není nutné kontrolovat databázi důvěry\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "další kontrola databáze důvěry v %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "není nutné kontrolovat databázi důvěry s modelem „%s“\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "není nutné aktualizovat databázi důvěry s modelem „%s“\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "veřejný klí� %s nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "prosím prove�te --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontroluji databázi důvěry\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -7819,7 +7985,7 @@ msgstr[0] "zpracován %d klí�"
 msgstr[1] "zpracovány %d klí�e"
 msgstr[2] "zpracováno %d klí�ů"
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -7827,17 +7993,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "žádný absolutně důvěryhodný klí� nebyl nalezen\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7845,28 +8011,28 @@ msgstr ""
 "hloubka: %d  platných: %3d  podepsaných: %3d  důvěra: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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í"
 
@@ -7878,40 +8044,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í ]"
 
@@ -7959,34 +8125,34 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sČíslo: %s%%0ADržitel: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Zbývá pokusů: %d"
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Prosím, zadejte PIN správce"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Prosím, zadejte PIN pro standardní klí�e."
 
@@ -8058,7 +8224,7 @@ msgstr "uložení otisku se nezdařilo: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "uložení data vytvoření se nezdařilo: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba při získání CHV z karty\n"
@@ -8122,7 +8288,7 @@ msgstr "PIN pro CHV%d je příliš krátký; minimální délka je %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "ověření CHV%d se nezdařilo: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
@@ -8268,13 +8434,13 @@ msgstr "karta nepodporuje hashovací algoritmus %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvořené podpisy: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, 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:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "přístup na %s se nezdařil – vadná OpenPGP karta?\n"
@@ -8290,55 +8456,55 @@ msgstr "||Prosím, zadejte svůj PIN na klávesnici �te�ky"
 msgid "|N|Initial New PIN"
 msgstr "|N|Prvotní nový PIN"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "pracovat ve více serverové režimu (na popředí)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|SOUBOR|zapisovat protokol do SOUBORU"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|připojit se na �te�ku na portu N"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "N�ZEV|použít N�ZEV jako ovlada� ct-API"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "N�ZEV|použít N�ZEV jako ovlada� PC/SC"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "nepoužívat vnitřní ovlada� CCID"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|odpojovat se od karty po N sekundách ne�innosti"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "nepoužívat klávesnici �te�ky"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "zakázat používání správcovských příkazů karty"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "používat vstup o proměnné délce na klávesnici �te�ky"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "zakázat používání správcovských příkazů karty"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Použití: @SCDAEMON@ [volby] (-h pro nápovědu)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8346,22 +8512,28 @@ msgstr ""
 "Syntaxe: scdaemon [volby] [příkaz [argumenty]]\n"
 "Démon pro �ipové karty (smartcard) pro @GNUPG@\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "prosím, použijte volbu „--daemon“, chcete-li nechat běžet program na pozadí\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "obsluha pro deskriptor %d spuštěna\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obsluha pro deskriptor %d ukon�ena\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "chyba při zjišťování informací o použití klí�e: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8419,7 +8591,7 @@ msgstr "hledám vydavatele na jiném místě\n"
 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:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "authorityInfoAccess nelze získat: %s\n"
@@ -8578,7 +8750,7 @@ msgstr "kořenový certifikát není ozna�en jako důvěryhodný"
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola seznamu důvěry se nepodařila: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "řetěz certifikátů je příliš dlouhý\n"
@@ -8633,7 +8805,7 @@ msgstr "%ubitový hash není platná pro %ubitový %s klí�\n"
 
 # Yet another expression for `not enough memory' :)
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8648,7 +8820,7 @@ msgstr "(toto je algoritmus MD2)\n"
 # none serial, none date
 # #-#-#-#-#  cs.po (dirmngr 1.0.3)  #-#-#-#-#
 # status
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "žádný"
 
@@ -8682,42 +8854,37 @@ msgstr ""
 "sériové �íslo %s, ID 0x%08lX,\n"
 "vytvořen %s, platnost vyprší %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "žádné použití klí�e není ur�eno – předpokládají se všechna použití\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "chyba při zjišťování informací o použití klí�e: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certifikát neměl být použit pro certifikování\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certifikát neměl být použit pro podepsání OCSP odpovědi\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certifikát neměl použit pro šifrování\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certifikát neměl být použit pro podepsání\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikát není použitelný pro šifrování\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikát není použitelný pro podepisování\n"
@@ -8906,6 +9073,11 @@ msgstr "Vytvořit sám sebou podepsaný certifikát? (a/N)"
 msgid "These parameters are used:\n"
 msgstr "Budou použity tyto parametry:\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "chyba při vytváření do�asného souboru: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "Nyní se vytváří sám sebou podepsaný certifikát. "
@@ -8986,123 +9158,123 @@ msgstr "smazání certifikátu „%s“ se nezdařilo: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(nebyli zadáni Žádní platní příjemci)\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "vypsat seznam externích klí�ů"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "vypsat řetěz certifikátů"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "importovat certifikáty"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "exportovat certifikáty"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "zaregistrovat �ipovou kartu"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "předat příkaz do dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "vyvolat gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "vytvářet výstup zakódovaný pomocí Base-64"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "vůbec nepoužívat terminál"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|po�et certifikátů, které zahrnout"
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|SOUBOR|vzít politiky ze SOUBORU"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "předpokládat vstup ve formátu PEM"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "předpokládat vstup ve formátu Base-64"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "předpokládat vstup v binárním formátu"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "vytvářet výstup zakódovaný pomocí Base-64"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|ID_UŽIVATELE|použít ID_UŽIVATELE jako implicitní tajný klí�"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|SOUBOR|přidat klí�enku na seznam klí�enek"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "stahovat chybějící certifikáty vydavatelů"
+
+#: sm/gpgsm.c:354
+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:372
 msgid "never consult a CRL"
 msgstr "nikdy nenahlížet do CRL"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "neprověřovat kořenové certifikáty proti CRL"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "kontrolovat platnost pomocí OCSP"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|po�et certifikátů, které zahrnout"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|SOUBOR|vzít politiky ze SOUBORU"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "nekontrolovat politiky certifikátu"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "stahovat chybějící certifikáty vydavatelů"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "vůbec nepoužívat terminál"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|SOUBOR|zapisovat protokol režimu server do SOUBORU"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|N�ZEV|použít šifrovací algoritmus N�ZEV"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|SOUBOR|zapisovat auditní protokol do SOUBORU"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|N�ZEV|použít hashovací algoritmus N�ZEV"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "dávkový režim: nikdy se neptat"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "předpokládat ano na většinu otázek"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "předpokládat ne na většinu otázek"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|SOUBOR|přidat klí�enku na seznam klí�enek"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|ID_UŽIVATELE|použít ID_UŽIVATELE jako implicitní tajný klí�"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|použít tento server pro dohledávání klí�ů"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|N�ZEV|použít šifrovací algoritmus N�ZEV"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|N�ZEV|použít hashovací algoritmus N�ZEV"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|SOUBOR|zapisovat auditní protokol do SOUBORU"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Použití: @GPGSM@ [možnosti] [soubory] (-h pro pomoc)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9112,27 +9284,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:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "neznámý model ověřování „%s“\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importují se běžné certifikáty „%s“\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nelze podepsat pomocí „%s“: %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "neplatný příkaz (neexistuje žádný implicitní příkaz)\n"
@@ -9192,7 +9364,7 @@ msgstr "problém při opakovaném hledání certifikátu: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "chyba při ukládání příznaků: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Chyba – "
 
@@ -9228,7 +9400,7 @@ msgstr ""
 "\n"
 "%s%sJste si skute�ně jisti, že to chcete udělat?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9279,24 +9451,24 @@ msgstr "[datum neudáno]"
 msgid "algorithm:"
 msgstr "algoritmus:"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 "neplatný podpis: atribut otisku zprávy se neshoduje s vypo�teným otiskem\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Dobrý podpis od"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "          alias"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Toto je kvalifikovaný podpis\n"
@@ -10090,112 +10262,135 @@ msgstr "o�ekáván absolutní název souboru\n"
 msgid "looking up '%s'\n"
 msgstr "hledá se „%s“\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "vypíše obsah CRL keše"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|SOUBOR|zavede CRL ze SOUBORU do keše"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|stáhne CRL z URL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "vypne dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "vyprázdní keš"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr "povolí kontrolu verze softwaru po síti"
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "běží bez dotazování se uživatele"
+#: dirmngr/dirmngr.c:218
+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:196
-msgid "force loading of outdated CRLs"
-msgstr "vynutí zavedení zastaralých CRL"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "povolí odesílání OCSP dotazů"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
+msgstr "směrovat veškerý síťový provoz skrz Tor"
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
-msgstr "povolí kontrolu verze softwaru po síti"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "Nastavení serverů klí�ů"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|používat server klí�ů na URL"
+
+#: dirmngr/dirmngr.c:244
+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:247
+msgid "Configuration for HTTP servers"
+msgstr "Nastavení HTTP serverů"
+
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "zakáže použití HTTP"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "zakáže použití LDAP"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignoruje HTTP distribu�ní místa CRL "
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
-msgstr "ignoruje LDAP distribu�ní místa CRL"
-
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "ignoruje URL služby OCSP uvedené v certifikátu"
-
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|všechny HTTP požadavky přesměruje na URL"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "používat systémové nastavení HTTP proxy"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "Nastavení používaných LDAP serverů"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "zakáže použití LDAP"
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignoruje LDAP distribu�ní místa CRL"
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|STROJ|pro LDAP dotazy použije STROJ"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "nepoužije náhradní stroje s --ldap-proxy"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|použít tento server pro dohledávání klí�ů"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|SOUBOR|na�te seznam LDAP serverů ze SOUBORU"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 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:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|nastaví �asový limit pro LDAP na N sekund"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "Nastavení OCSP"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "povolí odesílání OCSP dotazů"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignoruje URL služby OCSP uvedené v certifikátu"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|použije OCSP odpovída�e na URL"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|OTISK|OCSP odpovědi podepsané podle OTISKU"
 
-#: dirmngr/dirmngr.c:235
-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:240
-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
-msgid "route all network traffic via Tor"
-msgstr "směrovat veškerý síťový provoz skrz Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "vynutí zavedení zastaralých CRL"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10204,11 +10399,11 @@ msgstr ""
 "@\n"
 "(Úplný seznam příkazů a voleb naleznete v „info“ manuálu.)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Použití: @DIRMNGR@ [volby] (-h pro nápovědu)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10216,84 +10411,84 @@ msgstr ""
 "Syntaxe: @DIRMNGR@ [volby] [příkaz [argumenty]]\n"
 "Přístup k serveru s klí�i, CRL a OCSP z @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "platné úrovně ladění jsou: %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "použití: %s [volby] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "stahování CRL z „%s“ selhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "zpracování CRL z „%s“ selhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, 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:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: zjištěn neplatný otisk\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: chyba �tení: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, 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:1955
+#: dirmngr/dirmngr.c:1949
 #, 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:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "přijat SIGUSR2 – žádná akce nedefinována\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "přijat SIGTERM – vypíná se…\n"
 
 # TODO: plural
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "přijat SIGTERM – stále aktivních spojení: %d\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "vypnutí vynuceno\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "přijat SIGINT – okamžité vypnutí\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "přijat signál �. %d – žádná akce nedefinována\n"
@@ -10483,92 +10678,92 @@ msgstr "hašování OCSP odpovědi pro „%s“ selhalo: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "nepodepsáno výchozím OCSP certifikátem podepisovatele"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 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:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, 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:643
 #, 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:653
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "alokace OCSP kontextu selhala: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:692
 #, 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:698
 #, 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:705
 #, 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:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "použije se OCSP odpovída� „%s“\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, 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:792
 #, 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:793
 msgid "good"
 msgstr "dobrý"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, 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:846
 #, 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:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP odpovída� vrátil příliš starý stav\n"
@@ -10578,67 +10773,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:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "v ID certifikátu chybí serialno (sériové �íslo)"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "volání assuan_inquire selhalo: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "volání fetch_cert_by_url selhalo: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "chyba při odesílání dat: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "volání start_cert_fetch selhalo: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "volání fetch_next_cert selhalo: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies (max. odpovědí) %d překro�eno\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "řídící strukturu nelze alokovat: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "alokace kontextu assuan selhala: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "inicializace serveru selhala: %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "registrace příkazu u Assuanu selhala: %s\n"
 
-#: dirmngr/server.c:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problém příjmu Assuanu: %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "zpracování Assuanu se nezdařilo: %s\n"
@@ -10681,7 +10876,7 @@ msgstr "řetěz certifikátů je v pořádku\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certifikát neměl být použit pro podepsání CRL\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "stru�ný výstup"
 
@@ -10774,275 +10969,132 @@ msgstr "odesílání řádku selhalo: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "chyba při odesílání standardního parametru: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Volby ovlivňující diagnostický výstup"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Volby ovlivňující nastavení"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Volby užite�né při ladění"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Volby ovlivňující bezpe�nost"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|zahazovat klí�e SSH po N sekundách"
-
-#: tools/gpgconf-comp.c:541
-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"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N| nastavit maximální životnost klí�ů SSH na N sekund"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Volby vynucující politiku hesel"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "nedovolit obejití politiky hesel"
-
-#: tools/gpgconf-comp.c:576
-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"
-
-#: tools/gpgconf-comp.c:580
-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"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|SOUBOR|prověřovat nová hesla proti vzorům v SOUBORU"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|omezit platnost hesla na N dnů"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "nedovolit opakovat stará hesla"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|nastavit �asový limit pro Pinentry na N sekund"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|N�ZEV|použít N�ZEV jako implicitní tajný klí�"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|JMÉNO|šifrovat rovněž pro uživatele s ID JMÉNO"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|nastavit e-mailový alias"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "Nastavení serverů klí�ů"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL|používat server klí�ů na URL"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "povolit dohledávání PKA (dotazy na DNS)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|METODA|používat METODU pro dohledávání klí�ů podle e-mailové adresy"
-
-#: tools/gpgconf-comp.c:764
-msgid "import missing key from a signature"
-msgstr "importovat chybějící klí� z podpisu"
-
-#: tools/gpgconf-comp.c:767
-msgid "include the public key in signatures"
-msgstr "zahrnovat veřejný klí� do podpisů"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "zakázat veškerý přístup k dirmngr"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|N�ZEV|používat kódování N�ZEV pro PKCS#12 hesla"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "neprověřovat kořenové certifikáty proti CRL"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Volby ovlivňující podobu výstupu"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Volby ovlivňující interaktivitu a vymáhání"
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr "Volby ovlivňující použití Toru"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "Nastavení HTTP serverů"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "používat systémové nastavení HTTP proxy"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "Nastavení používaných LDAP serverů"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "Seznam LDAP serverů"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "Nastavení OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr "Soukromé klí�e"
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr "Čipové karty"
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr "Síť"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr "Pole pro heslo"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "Komponenta není vhodná pro spuštění"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Konfigura�ní soubor komponenty %s je rozbitý\n"
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Selhalo externí ověření komponenty %s"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 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:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "chyba při uzavírání „%s“\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "chyba při rozboru „%s“\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "vypsat všechny komponenty"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "zkontrolovat všechny programy"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENTA|vypsat volby"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENTA|změnit volby"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENTA|zkontrolovat volby"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "aplikovat globální implicitní hodnoty"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr "|SOUBOR|aktualizovat konfigura�ní soubory pomocí SOUBORU"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "získat adresáře s nastavením @GPGCONF@"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "vypsat globální konfigura�ní soubor"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "zkontrolovat globální konfigura�ní soubor"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr "dotázat se databázi verzí softwaru"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "znovu na�íst všechny nebo zadané komponenty"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "spustit zadanou komponentu"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "zabít zadanou komponentu"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "použít jako výstupní soubor"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "provést změny za běhu, pokud to lze"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Použití: @GPGCONF@ [volby] (-h pro nápovědu)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11050,15 +11102,15 @@ msgstr ""
 "Syntaxe: @GPGCONF@ [volby]\n"
 "Spravuje konfigura�ní volby nástrojů, které patří do systému @GNUPG@\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Potřebuji jeden argument ur�ující komponentu"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Komponenta nenalezena"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "Žádné argumenty nejsou povoleny"
 
@@ -11075,6 +11127,36 @@ msgstr ""
 "Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
 "Prověří heslo zadané na vstupu proti souboru se vzory\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "chyba při zápisu do do�asného souboru: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "použít pro server soubor s protokolem"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|SOUBOR|zapisovat protokol režimu server do SOUBORU"
+
+#~ msgid "run without asking a user"
+#~ msgstr "běží bez dotazování se uživatele"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "povolit dohledávání PKA (dotazy na DNS)"
+
+#~ msgid "import missing key from a signature"
+#~ msgstr "importovat chybějící klí� z podpisu"
+
+#~ msgid "include the public key in signatures"
+#~ msgstr "zahrnovat veřejný klí� do podpisů"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "Volby ovlivňující podobu výstupu"
+
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Volby ovlivňující použití Toru"
+
+#~ msgid "LDAP server list"
+#~ msgstr "Seznam LDAP serverů"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "požaduji klí� %s z %s serveru %s\n"
 
@@ -11245,9 +11327,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "%s nelze otevřít pro zápis: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "chyba při zápisu do %s: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "chyba při �tení z %s': %s\n"
 
@@ -11404,9 +11483,6 @@ msgstr ""
 #~ msgid "shadowing the key failed: %s\n"
 #~ msgstr "výroba stínového klí�e se nezdařila: %s\n"
 
-#~ msgid "do not grab keyboard and mouse"
-#~ msgstr "neuzurpovat si klávesnici a myš"
-
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "problémy v komunikaci s gpg-agentem\n"
 
diff --git a/po/da.gmo b/po/da.gmo
index febbf6d..5550050 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 9bef60a..79405c9 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -164,8 +164,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "Adgangsfrase:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "matcher ikke - prøv igen"
 
@@ -210,13 +210,51 @@ msgstr "Ugyldig PIN"
 msgid "Bad Passphrase"
 msgstr "Ugyldig adgangsfrase"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "fejl ved indhentelse af serielnummer for kort: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Genindtast venligst denne adgangsfrase"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase to protect the imported object within the "
+#| "GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Indtast venligst adgangsfrasen for at beskytte det importeret objekt inden i "
+"GnuPG-systemet."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -224,52 +262,45 @@ msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
 msgid "can't create '%s': %s\n"
 msgstr "kan ikke oprette »%s«: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "kan ikke åbne »%s«: %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "fejl ved indhentelse af serielnummer for kort: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "detekteret kort med S/N: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 #| msgid "error getting default authentication keyID of card: %s\n"
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "fejl ved indhentelse af standard-keyID for godkendelses af kort: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "ingen egnet kortnøgle fundet: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "fejl ved indhentelse af gemte flag: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -278,24 +309,20 @@ msgstr ""
 "En ssh-proces anmodte om brugen af nøgle%%0A  %s%%0A  (%s)%%0AØnsker du at "
 "tillade dette"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "Tillad"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "Nægt"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Indtast venligst adgangsfrasen for ssh-nøglen%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Genindtast venligst denne adgangsfrase"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -304,98 +331,94 @@ msgstr ""
 "Indtast venligst en adgangsfrase for at beskytte den modtaget hemmelige nøgle"
 "%%0A   %s%%0A   %s%%0Ainden i gpg-agentens nøglelager"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "Indsæt venligst kortet med serielnummeret"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "Fjern venligst det aktuelle kort og indsæt det med serielnummeret"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "Administrator-PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Nulstillingskode"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0ABrug læserens numeriske tastatur for indtastning."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Gentag denne nulstillingskode"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "Gentag denne PUK"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Gentag denne PIN"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Nulstillingskode er ikke korrekt gentaget; prøv igen"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK er ikke korrekt gentaget; prøv igen"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN er ikke korrekt gentaget; prøv igen"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Indtast venligst PIN'en%s%s%s for at låse kortet op"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "fejl ved skrivning til midlertidig fil: %s\n"
+#: agent/genkey.c:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "fejl ved skrivning til »%s«: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Indtast ny adgangsfrase"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "Brug denne alligevel"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, 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:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -404,11 +427,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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Ja, beskyttelse er ikke krævet"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -416,7 +439,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:296
+#: agent/genkey.c:282
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -434,7 +457,7 @@ msgstr[1] ""
 "Advarsel: Du har indtastet en usikker adgangsfrase.%%0AEn adgangsfrase skal "
 "indeholde mindst %u cifre eller%%0specielle tegn."
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
@@ -444,7 +467,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:338
+#: agent/genkey.c:324
 #, fuzzy
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -457,160 +480,234 @@ msgstr ""
 "Advarsel: Du har indtastet en usikker adgangsfrase.%%0AEn adgangsfrase skal "
 "være mindst %u tegn langt."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Indtast venligst den nye adgangsfrase"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Indstillinger:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+#, fuzzy
+#| msgid "Options useful for debugging"
+msgid "Options used for startup"
+msgstr "Tilvalg nyttige for fejlsøgning"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "kør i dæmontilstand (baggrunden)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "kør i servertilstand (forgrunden)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "kør i servertilstand"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "uddybende"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "vær mindre uddybende"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "frakobl ikke fra konsollen"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "kommandoresultat i sh-stil"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "kommandoresultat i csh-stil"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|læs tilvalg fra FIL"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "frakobl ikke fra konsollen"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Tilvalg der kontrollerer det diagnostiske resultat"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "brug en logfil for serveren"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "uddybende"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|brug PGM som PIN-Entry-program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "vær mindre uddybende"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|brug PGM som SCdaemon-program"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|skriv servertilstandslogge til FIL"
+
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Tilvalg der kontrollerer konfigurationen"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "brug ikke SCdaemon'en"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|brug PGM som SCdaemon-program"
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorer forespørgsler om at ændre TTY'en"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorer forespørgsler om at ændre X-skærmen"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "enable ssh-agent emulation"
+msgid "enable ssh support"
+msgstr "aktiver ssh-agent-emulering"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr ""
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Tilvalg der kontrollerer sikkerheden"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|udløb mellemlagrede PIN'er efter N sekunder"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|udløb SSH-nøgler efter N sekunder"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|angive maksimal livsforløb for SSH-nøgle til N sekunder"
+
+#: agent/gpg-agent.c:248
 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:250
 #, 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:252
 #, 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:257
 msgid "allow presetting passphrase"
 msgstr "tillad forhåndsindstilling af adgangsfrase"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
+
+#: agent/gpg-agent.c:267
+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:269
+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:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|kontroller nye adgangsfraser mod mønstre i FIL"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|giv adgangsfrasen udløb efter N dage"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "tillad ikke genbrug af gamle adgangsfraser"
+
+#: agent/gpg-agent.c:281
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the PIN-Entry"
+msgstr "Tilvalg der kontrollerer sikkerheden"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:258
+#: agent/gpg-agent.c:287
 #, fuzzy
-#| msgid "enable ssh-agent emulation"
-msgid "enable ssh support"
-msgstr "aktiver ssh-agent-emulering"
+#| 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:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr ""
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|brug PGM som PIN-Entry-program"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
+#: agent/gpg-agent.c:294
+#, 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:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapporter venligst fejl til <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:551
+#: agent/gpg-agent.c:572
 #, 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:553
+#: agent/gpg-agent.c:574
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -622,147 +719,155 @@ msgstr ""
 "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
 "Hemmelig nøglehåndtering for GnuPG\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, 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:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgt sammendragsalgoritme er ugyldig\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette sokkel: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, 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:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "fejl ved indhentelse af nonce for soklen\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, 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:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, 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:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "kan ikke oprette mappe »%s«: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 #| msgid "directory `%s' created\n"
 msgid "directory '%s' created\n"
 msgstr "mappe »%s« oprettet\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, 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:2374
+#: agent/gpg-agent.c:2356
 #, 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:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, 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:2739
+#: agent/gpg-agent.c:2721
 #, 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:2744
+#: agent/gpg-agent.c:2726
 #, 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:2819
+#: agent/gpg-agent.c:2801
 #, 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:2824
+#: agent/gpg-agent.c:2806
 #, 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:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, 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:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppet\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kører i denne session\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Indstillinger:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Brug: gpg-preset-passphrase [tilvalg] KEYGRIP (-h for hjælp)\n"
@@ -775,8 +880,8 @@ msgstr ""
 "Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
 "Adgangskode for mellemlagervedligeholdelse\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -784,9 +889,8 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -844,50 +948,50 @@ msgstr "afbrudt\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fejl ved oprettelse af adgangsfrasen: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
 msgstr "fejl ved åbning af »%s«: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 #| msgid "file `%s', line %d: %s\n"
 msgid "file '%s', line %d: %s\n"
 msgstr "fil »%s«, linje %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 #| msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "udtryk »%s« ignoreret i »%s«, linje %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 #| msgid "system trustlist `%s' not available\n"
 msgid "system trustlist '%s' not available\n"
 msgstr "troværdig liste for systemet »%s« er ikke tilgængelig\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 #| msgid "bad fingerprint in `%s', line %d\n"
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "ugyldigt fingeraftryk i »%s«, linje %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "ugyldigt nøgleflag i »%s«, linje %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 #| msgid "error reading `%s', line %d: %s\n"
 msgid "error reading '%s', line %d: %s\n"
 msgstr "fejl ved læsning af »%s«, linje %d: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
@@ -900,7 +1004,7 @@ msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -909,11 +1013,11 @@ msgstr ""
 "Stoler du fuldstændig på at%%0A  \"%s\"%%0Akorrekt certificerer "
 "brugercertifikater?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "Nej"
@@ -926,7 +1030,7 @@ msgstr "Nej"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -938,20 +1042,20 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "Forkert"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Bemærk: Denne adgangsfrase er aldrig blevet ændret.%0AÆndr den nu."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -960,15 +1064,15 @@ msgstr ""
 "Denne adgangsfrase er ikke blevet ændret%%0Asiden %.4s-%.2s-%.2s. Ændr den "
 "nu."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Ændr adgangsfrasen"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "Jeg ændrer den senere"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -976,13 +1080,13 @@ msgid ""
 "%%0A?"
 msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "aktiver nøgle"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1014,7 +1118,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1032,13 +1136,13 @@ msgstr "beskyttelsesalgoritme %d%s er ikke understøttet\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "beskyttelsesalgoritme %d%s er ikke understøttet\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fejl ved oprettelse af datakanal: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
@@ -1046,43 +1150,43 @@ msgstr "fejl ved oprettelse af datakanal: %s\n"
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "fejl ved oprettelse af datakanal: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fejl ved forgrening af proces: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 #| msgid "error running `%s': probably not installed\n"
 msgid "error running '%s': probably not installed\n"
 msgstr "fejl ved kørsel af »%s«: sikkert ikke installeret\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error running '%s': exit status %d\n"
 msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 #| msgid "error running `%s': terminated\n"
 msgid "error running '%s': terminated\n"
 msgstr "fejl ved kørsel af »%s«: termineret\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 #| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fejl ved indhentelse af afslutningskode for proces %d: %s\n"
@@ -1113,13 +1217,13 @@ msgstr "Advarsel: usikker ejerskab på %s »%s«\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "venter %d sekunder på at agenten kommer frem\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
@@ -1180,23 +1284,23 @@ 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:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "fejl ved allokering af nok hukommelse: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: forældet indstilling »%s« - den har ingen effekt\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1510,7 +1614,7 @@ msgstr "ugyldig indstilling"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid argument for option \"%.50s\"\n"
@@ -1541,19 +1645,19 @@ msgstr "kommando »%.50s« er tvetydig\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "ugyldigt tilvalg »%.50s«\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "BEMÆRK: Ingen standardfil for tilvalg »%s«\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "tilvalgsfil »%s«: %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1575,44 +1679,44 @@ msgstr "iconv_open mislykkedes: %s:\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konvertering fra »%s« til »%s« mislykkedes: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 #| msgid "error writing to `%s': %s\n"
 msgid "error writing to '%s': %s\n"
 msgstr "fejl ved skrivning til »%s«: %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "fjerner stale-låsfil (oprettet af %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "venter på lås (holdt af %d%s) %s ...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(baglås?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 #| msgid "lock `%s' not made: %s\n"
 msgid "lock '%s' not made: %s\n"
 msgstr "lås »%s« er ikke udført: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "venter på lås %s ...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s er for gammel (kræver %s, har %s)\n"
@@ -1857,23 +1961,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "opret et tilbagekaldscertifikat"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnr. %s detekteret\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1889,8 +1993,8 @@ msgstr "Denne kommando er kun tilgængelig for version 2-kort\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1900,122 +2004,122 @@ msgstr "Dit valg? "
 msgid "[not set]"
 msgstr "[ikke indstillet]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fejl: Kun ren ASCII er tilladt i øjeblikket.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fejl: Tegnet »<« må ikke bruges.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fejl: Dobbelt mellemrum er ikke tilladt.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Kortholders efternavn: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "Adresse hvor offentlig nøgle skal hentes: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 #| msgid "error writing `%s': %s\n"
 msgid "error writing '%s': %s\n"
 msgstr "fejl ved skrivning af »%s«: %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Loginddata (kontonavn): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Private DO-data: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Sprogpræferencer: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fejl: ugyldig længde for præferencestreng.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fejl: ugyldige tegn i præferencestreng.\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Fejl: ugyldigt svar.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "CA-fingeraftryk: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fejl: Ugyldigt formateret fingeraftryk.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nøglehandling er ikke mulig: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Erstat eksisterende nøgle? (j/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -2026,110 +2130,110 @@ msgstr ""
 "        dokumentationen for dit kort for at se hvilke størrelser, der\n"
 "        er tilladt.\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken nøglestørrelse ønsker du? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afrundet op til %u bit\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s nøglestørrelser skal være i intervallet %u-%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Underskriftsnøgle\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Krypteringsnøgle\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Godkendelsesnøgle\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA og Elgamal\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, 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:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 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:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstat eksisterende nøgler (j/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2144,175 +2248,175 @@ msgstr ""
 "   PIN = »%s«     Admin-PIN = »%s«\n"
 "Du bør ændre dem med kommandoen --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 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:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Underskriftsnøgle\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnøgle\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Godkendelsesnøgle\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "Vælg venligst hvor nøglen skal gemmes:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "KEYTOCARD failed: %s\n"
 msgstr "læsning mislykkedes: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "Underskriv? (j/N) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, 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:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "vis administratorkommandoer"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "vis denne hjælpetekst"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "vis alle tilgængelige data"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "ændr kortholders navn"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "ændr adresse for at indhente nøgle"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "hent nøglen angivet i kortadressen"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "ændr logindnavnet"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "ændr sprogpræferencerne"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "ændr kortholders køn"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "ændr et CA-fingeraftryk"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "skift force PIN-flag for underskriften"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "opret nye nøgler"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "menu til at ændre eller fjerne blokering for PIN'en"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "verificer PIN'en og vis alle data"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "fjern blokering for PIN'en med en nulstillingskode"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ændr ejertroværdigheden"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "Kommandoer kun for administratoren\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Administratorkommandoer er tilladt\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "Administratorkommandoer er ikke tilladt\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando (prøv »help«)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "kan ikke åbne »%s«\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nøglen »%s« blev ikke fundet: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2375,8 +2479,8 @@ msgid "subkey"
 msgstr "Pubkey: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "opdatering mislykkedes: %s\n"
@@ -2416,27 +2520,27 @@ msgstr "kan ikke bruge en symmetrisk ESK-pakke på grund af S2K-tilstanden\n"
 msgid "using cipher %s\n"
 msgstr "bruger chiffer %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "»%s« allerede komprimeret\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "ADVARSEL: »%s« er en tom fil\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgid "digest algorithm '%s' may not be used in %s mode\n"
@@ -2462,7 +2566,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2471,34 +2581,34 @@ msgstr ""
 "ADVARSEL: Tvang for komprimeringsalgoritme %s (%d) overtræder modtagerens "
 "præferencer\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "tvang for symmetrisk chiffer %s (%d) overtræder modtagerens præferencer\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: »%s«\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruge %s i tilstanden %s\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterede data\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypteret med ukendt algoritme %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2506,7 +2616,7 @@ msgstr ""
 "ADVARSEL: Besked blev krypteret med en svag nøgle i den symmetriske "
 "chiffer.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem ved håndtering af krypteret pakke\n"
@@ -2701,227 +2811,285 @@ msgstr "Ugyldig nøgle %s gjort gyldig med --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger undernøgle %s i stedet for primær nøgle %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "opret en underskrift"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "opret en underskrift i klartekst"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "opret en separat underskrift"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "krypter data"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "krypter kun med symmetrisk chiffer"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "afkrypter data (standard)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "godkend en underskrift"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "vis nøgler"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "vis nøgler og underskrifter"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "vis og kontroller nøgleunderskrifter"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "vis nøgler og fingeraftryk"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "vis hemmelige nøgler"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "opret et tilbagekaldscertifikat"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "fjern nøgler fra den offentlige nøglering"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøgler fra den hemmelige nøglering"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "underskriv en nøgle"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "underskriv en nøgle lokalt"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "underskriv en nøgle"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "underskriv en nøgle lokalt"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "underskriv eller rediger en nøgle"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "ændr en adgangsfrase"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "eksporter nøgler"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "eksporter nøgler til en nøgletjener"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importer nøgler fra en nøgleserver"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "søg efter nøgler på en nøgleserver"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "opdater alle nøgler fra en nøgleserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importer/sammenføj nøgler"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "udskriv kortstatus"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "ændr data på et kort"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "ændr et korts PIN"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "opdater troværdighedsdatabasen"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "vis beskedsammendrag"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "kør i servertilstand"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|krypter også til bruger-id-NAVN"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|opsæt e-post-aliasser"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "brug streng OpenPGP-opførsel"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "lav ingen ændringer"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "spørg før overskrivning"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the input"
+msgstr "Tilvalg der kontrollerer sikkerheden"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+#, fuzzy
+#| msgid "Options controlling the diagnostic output"
+msgid "Options controlling the output"
+msgstr "Tilvalg der kontrollerer det diagnostiske resultat"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "opret ascii-pansrede uddata"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|USER-ID|krypter for BRUGER-ID"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|skriv resultat til FIL"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "brug kanonisk teksttilstand"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "brug kanonisk teksttilstand"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+#, fuzzy
+#| msgid "Options controlling the interactivity and enforcement"
+msgid "Options controlling key import and export"
+msgstr "Tilvalg der kontrollerer interaktiviteten og tvang"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|FILE|skriv resultat til FIL"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|brug MEKANISMER til at finde nøgler efter postadresser"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "lav ingen ændringer"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "deaktiver al adgang til dirmngr"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "spørg før overskrivning"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+#, fuzzy
+#| msgid "Options controlling the configuration"
+msgid "Options controlling key listings"
+msgstr "Tilvalg der kontrollerer konfigurationen"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "brug streng OpenPGP-opførsel"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "vis hemmelige nøgler"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|krypter for BRUGER-ID"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2929,7 +3097,7 @@ msgstr ""
 "@\n"
 "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2959,14 +3127,14 @@ msgstr ""
 " --list-keys [navne]        vis nøgler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
 
 # Skal alt dette oversættes eller er det tilvalgene?
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2981,7 +3149,7 @@ msgstr ""
 "Sign, check, encrypt eller decrypt\n"
 "standardhandling afhænger af inddata\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2989,82 +3157,82 @@ msgstr ""
 "\n"
 "Understøttede algoritmer:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "brug: gpgsm [tilvalg] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "kommandoer er i konflikt\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "ingen = tegn fundet i gruppedefinition »%s«\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, 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:1627
+#: g10/gpg.c:1653
 #, 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:1630
+#: g10/gpg.c:1656
 #, 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:1636
+#: g10/gpg.c:1662
 #, 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:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, 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:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3073,19 +3241,19 @@ msgid ""
 msgstr ""
 "ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3095,470 +3263,470 @@ msgid ""
 msgstr ""
 "ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "ukendt konfigurationspunkt »%s«\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "vis billed-id'er under nøglevisninger"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, 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:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "vil politikadresser under underskriftvisninger"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "vis alle notationer under underskriftvisninger"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotationer under underskriftvisninger"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brugerangivne notationer under underskriftvisninger"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "vis bruger-id-validitet under nøglevisninger"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 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:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "vis nøgleringsnavnet i nøglevisninger"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "vis udløbsdatoer under underskriftvisninger"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "ukendt tilvalg »%s«\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, 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:3086
+#: g10/gpg.c:3085
 #, 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:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, 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:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, 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:3178
+#: g10/gpg.c:3177
 #, 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:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke fortolke nøgleserveradresse\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importindstillinger\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "ugyldige importindstillinger\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "vis billed-id'er under underskriftverificering"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "vis politikadresser under underskriftverificering"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "vis alle notationer under underskriftverificering"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotationer under underskriftverificering"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "vis brugerangivne notationer under underskriftverificering"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "vis bruger-id-validitet under underskriftverificering"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr "vis kun den primære bruger-id i underskriftverificering"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "valider underskrifter med PKA-data"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke angive kørselssti til %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: program kan oprette en kernefil!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overskriver %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsløs sammen med %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "ADVARSEL: kører med forfalsket systemtid: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt chifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, 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:3839
+#: g10/gpg.c:3837
 #, 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:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldigt min-cert-level; skal være 1, 2 eller 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BEMÆRK: simpel S2K-tilstand (0) frarådes på det skarpeste\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-tilstand; skal være 0, 1 eller 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ugyldige standardpræferencer\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldige præferencer for personlig chiffer\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldige præferencer for personlig sammendrag\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldige præferencer for personlig komprimering\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker endnu ikke med %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TrustDB: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, 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:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nøgleserver send mislykkedes: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nøgleserver modtag mislykkedes: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøgleeksport mislykkedes: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, 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:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nøgleserver søg mislykkedes: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "nøgleserver opdater mislykkedes: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "påklædning af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ugyldig hash-algoritme »%s«\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "GÃ¥ til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
@@ -3571,7 +3739,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation til denne FD"
 
@@ -4303,7 +4471,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker på, at du stadig vil underskrive (j/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Kunne ikke underskrive.\n"
 
@@ -4486,8 +4654,8 @@ msgstr "Jeg har omhyggeligt kontrolleret denne nøgle.\n"
 msgid "Really sign? (y/N) "
 msgstr "Underskriv? (j/N) "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "underskrift mislykkedes: %s\n"
@@ -4699,7 +4867,7 @@ msgstr ""
 "tnrsign\n"
 "  etc.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Nøglen er tilbagekaldt."
 
@@ -4750,7 +4918,7 @@ msgstr "Vil du virkelig fjerne denne bruger-id? (j/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Vil du virkelig flytte den primære nøgle? (j/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "Du skal vælge præcis en nøgle.\n"
 
@@ -4828,175 +4996,175 @@ msgstr "Gem ændringer? (j/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? (j/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Nøgle ikke ændret så ingen opdatering krævet.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 #| msgid "failed to get the fingerprint\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "kunne ikke indhente fingeraftrykket\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "ugyldig værdi\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Ingen sådan bruger-id.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "Nothing to sign with key %s\n"
 msgid "Nothing to sign.\n"
 msgstr "Intet at underskrive med nøgle %s\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Ikke underskrevet af dig.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "kontrol af oprettet underskrift mislykkedes: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "»%s« er ikke et gyldigt underskriftudløb\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "nøglen »%s« blev ikke fundet: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Sammendrag: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Nøgleserver no-modify"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Fortrukken nøgleserver: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Der er ingen præferencer på en bruger-id i PGP 2.x-stil.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Den følgende nøgle blev tilbagekaldt den %s af %s nøgle %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne nøgle er tilbagekaldt af %s nøgle %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "oprettet: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "tilbagekaldt: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "udløbet: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "udløber: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "brug: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "kortnr.: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "troværdighed: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "validitet: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Denne nøgle er blevet deaktiveret"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5004,17 +5172,17 @@ msgstr ""
 "Bemærk venligst at den viste nøglevaliditet ikke nødvendigvis er\n"
 "korrekt med mindre du genstarter programmet.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "tilbagekaldt"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "udløbet"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5023,18 +5191,18 @@ msgstr ""
 "ADVARSEL: Intet bruger-id er blevet markeret som primær. Denne kommando\n"
 "        kan medføre at et anden bruger-id bliver den formodede primære.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5044,35 +5212,35 @@ msgstr ""
 "medføre at\n"
 "          nogle version af PGP afviser denne nøgle.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker på, at du stadig ønsker at tilføje den? (j/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slet denne gode underskrift? (j/N/a)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Slet denne ugyldige underskrift? (j/N/a)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Slet denne ukendte underskrift? (j/n/a)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Virkelig slette denne egenunderskrift? (j/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5080,20 +5248,20 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Slettede %d underskrift.\n"
 msgstr[1] "Slettede %d underskrift.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Intet slettet.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Bruger-id »%s« komprimeret: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5101,17 +5269,17 @@ msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
 msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Bruger-id »%s«: allerede minimeret\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Bruger-id »%s«: allerede ryddet\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5121,44 +5289,44 @@ msgstr ""
 "tilbagekalder\n"
 "          kan medføre at nogle versioner af PGP afviser denne nøgle.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Du må ikke tilføje en dedikeret tilbagekalder til en nøgle i PGP 2.x-stil.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kan ikke udpege en nøgle i PGP 2.x-stil som dedikeret tilbagekalder\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan ikke udpege en nøgle som dets egen dedikerede tilbagekalder\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "denne nøgle er allerede blevet dedikeret som en tilbagekalder\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ADVARSEL: Udpegning af en nøgle som en dedikeret tilbagekalder kan ikke "
 "fortrydes!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
 "tilbagekalder? (j/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5169,179 +5337,179 @@ msgstr ""
 "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
 "tilbagekalder? (j/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "underskriftsundernøgle %s er allerede krydscertificeret\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "undernøgle %s underskriver ikke og skal derfor ikke være krydscertificeret\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Vælg venligst præcis en bruger-id.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Indtast din foretrukne nøglerserveradresse: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 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:5344
+#: g10/keyedit.c:5400
 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:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Indtast notationen: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Fortsæt? (j/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med hash %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, 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:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøgle med indeks %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: »%s«\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (kan ikke eksporteres)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne underskrift udløb den %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Opret et tilbagekaldscertifikat for denne underskrift? (j/N) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (kan ikke tilbagekaldes)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "tilbagekaldt af din nøgle %s på %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du er i gang med at tilbagekalde disse underskrifter:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opret tilbagekaldscertifikaterne? (j/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemmelig nøgle\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "bruger-id »%s« er allerede tilbagekaldt\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nøgle %s er allerede tilbagekaldt.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5820,7 +5988,7 @@ msgstr ""
 "taloprettelsesprogram en bedre mulighed for at opnå nok entropi.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nøgleoprettelse mislykkedes: %s\n"
@@ -5894,11 +6062,11 @@ msgstr "ingen skrivbar offentlig nøglering fundet: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "fejl ved skrivning af offentlig nøglering »%s«: %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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"
@@ -5906,7 +6074,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5914,7 +6082,7 @@ msgstr ""
 "nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
 "urproblem)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5922,24 +6090,24 @@ msgstr ""
 "nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
 "urproblem)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette? (j/N) "
 
@@ -6155,258 +6323,258 @@ msgstr "anmoder om nøgle %s fra %s\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: kan ikke hente URI %s: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "underlig størrelse for en krypteret sessionsnøgle (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s krypteret sessionsnøgle\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "adgangsfrase oprettet med ukendt sammendragsalgoritme %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig nøgle er %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "krypterede data for offentlig nøgle: god DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krypteret med %u-bit %s nøgle, id %s, oprettet %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      »%s«\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypteret med %s nøgle, id %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "afkryptering af offentlig nøgle mislykkedes: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "ADVARSEL: flere klartekster set\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypteret med %lu adgangsfraser\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypteret med 1 adgangsfrase\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antager %s krypterede data\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: besked var ikke integritetsbeskyttet\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "afkryptering mislykkedes: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "afkryptering okay\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ADVARSEL: krypteret besked er blevet manipuleret!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "afkryptering mislykkedes: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "oprindeligt filnavn=»%.*s«\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "ingen underskrift fundet\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "UGYLDIG underskrift fra »%s«"
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Udløbet underskrift fra »%s«"
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God underskrift fra »%s«"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "underskriftverificering undertrykt\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan ikke håndtere disse tvetydige underskriftdata\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Underskrift lavet %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruger %s nøgle %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "       også kendt som »%s«"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Nøgle tilgængelig på: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "       også kendt som »%s«"
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Underskrift udløbet %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Underskrift udløber %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binær"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "tekstilstand"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "ukendt"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritme: %s"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke kontrollere underskrift: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ikke en frakoblet underskrift\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6414,12 +6582,12 @@ msgstr ""
 "ADVARSEL: flere underskrifter detekteret. Kun den første vil blive "
 "kontrolleret.\n"
 
-#: g10/mainproc.c:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "uafhængig underskrift for klasse 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) underskrift\n"
@@ -6489,72 +6657,72 @@ msgstr "læsefejl i »%s«: %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: forældet indstilling »%s«\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "brug venligst »%s%s« i stedet for\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ADVARSEL: »%s« er en forældet kommando - brug den ikke\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: forældet indstilling »%s« - den har ingen effekt\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Ukomprimeret"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "ukomprimeret|ingen"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "denne besked kan nok ikke bruges af %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 #| msgid "ambiguous option `%s'\n"
 msgid "ambiguous option '%s'\n"
 msgstr "tvetydigt tilvalg »%s«\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown option '%s'\n"
 msgstr "ukendt tilvalg »%s«\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, fuzzy, c-format
 #| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "DSA kræver at hashlængden skal gå op i 8 bit\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6590,23 +6758,23 @@ msgstr "skriver til stdout\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "antager underskrevne data i »%s«\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan ikke håndtere offentlig nøglealgoritme %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "ADVARSEL: potentiel usikker symmetrisk krypteret sessionsnøgle\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kritisk underskriftnotation: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpakke af typen %d har kritiske bitsæt\n"
@@ -7050,12 +7218,12 @@ msgstr "ukendt standardmodtager »%s«\n"
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Bemærk: nøgle %s har ingen %s-funktion\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Bemærk: nøgle %s har ingen præference for %s\n"
@@ -7499,7 +7667,7 @@ 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!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "stol på post %lu, type %d: skrivning mislykkedes: %s\n"
@@ -7547,7 +7715,7 @@ msgstr "fejl under forsøg på at finde troværdighedspost i »%s«: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "læsefejl i »%s«: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronisering mislykkedes: %s\n"
@@ -8070,97 +8238,97 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "»%s« er ikke et gyldigt nøgle-id\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "nøgle %s: accepteret som troværdig nøgle\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "nøgle %s fremgår mere end en gang i trustdb\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "nøgle %s: ingen offentlig nøgle for troværdig nøgle - udeladt\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "nøgle %s markeret som ultimativ troværdig\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "troværdighedspost %lu, req-type %d: læsning mislykkedes: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "troværdighedspost %lu er ikke af den anmodne type %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "Du kan forsøge at genskabe trustdb med kommandoerne:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Hvis det ikke virker, så se venligst manualen\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "kan ikke bruge ukendt troværdighedsmodel (%d) - antager %s "
 "troværdighedsmodel\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "bruger %s troværdighedsmodel\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "intet behov for kontrol af trustdb\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "næste kontrol af trustdb sker den %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 #| msgid "no need for a trustdb check with `%s' trust model\n"
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "intet behov for kontrol af trustdb med troværdighedsmodellen »%s«\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 #| msgid "no need for a trustdb update with `%s' trust model\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "intet behov for en opdatering af trustdb med troværdighedsmodellen »%s«\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "offentlig nøgle %s blev ikke fundet: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "udfør venligst en --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontrollerer trustdb\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8168,7 +8336,7 @@ msgid_plural "%d keys processed"
 msgstr[0] "     %lu-nøgler behandlet\n"
 msgstr[1] "     %lu-nøgler behandlet\n"
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8176,17 +8344,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "ingen ultimativ troværdige nøgler fundet\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8194,28 +8362,28 @@ msgstr ""
 "dybde: %d  gyldig: %3d  underskrevet: %3d  troværdighed: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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"
 
@@ -8227,43 +8395,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. ]"
 
@@ -8311,19 +8479,19 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Indtast venligst PIN'en for nøglen til at oprette kvalificerede "
@@ -8331,15 +8499,15 @@ 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Indtast venligst administrator-PIN'en"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Indtast venligst PIn'en for standardnøglerne."
 
@@ -8411,7 +8579,7 @@ msgstr "kunne ikke gemme fingeraftrykket: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "fejl ved indhentelse af CHV-status fra kort\n"
@@ -8479,7 +8647,7 @@ msgstr "PIN for CHV%d er for kort; minimumlængde er %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificering af CHV%d mislykkedes: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent låst!\n"
@@ -8623,7 +8791,7 @@ msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "underskrifter oprettet indtil videre: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8631,7 +8799,7 @@ msgstr ""
 "verifikation af administrator-PIN er i øjeblikket forbudt via denne "
 "kommando\n"
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke tilgå %s - ugyldig OpenPGP-kort?\n"
@@ -8647,57 +8815,57 @@ msgstr "||Indtast venligst din PIN på læserens numeriske tastatur"
 msgid "|N|Initial New PIN"
 msgstr "|N|Oprindelig ny PIN"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "kør i flerservertilstand (forgrund)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|skriv en log til FIL"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|forbind til læser på port N"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|brug NAVN som ct-API-driver"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|brug NAVN som PC/SC-driver"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "brug ikke den interne CCID-driver"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|frakobl kortet efter N sekunder inaktivitet"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "brug ikke en læsers numeriske tastatur"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "nægt brugen af kommandoer for administratorkort"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "nægt brugen af kommandoer for administratorkort"
+
+#: scd/scdaemon.c:326
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 #, fuzzy
 #| msgid ""
 #| "Syntax: scdaemon [options] [command [args]]\n"
@@ -8709,7 +8877,7 @@ msgstr ""
 "Syntaks: scdaemon [tilvalg] kommando [parametre]]\n"
 "Smartcard-dæmon for GnuPG\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, fuzzy, c-format
 #| msgid ""
 #| "please use the option `--daemon' to run the program in the background\n"
@@ -8717,16 +8885,22 @@ 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:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "håndtering for fd %d startet\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "håndtering for fd %d termineret\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "fejl ved indhentelse af nøglebrugsinformation: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8786,7 +8960,7 @@ msgstr "slår udsteder op på ekstern placering\n"
 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:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8949,7 +9123,7 @@ msgstr "rodcertifikat er ikke markeret som troværdig"
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certifikatkæde er for lang\n"
@@ -9003,7 +9177,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bit-hash er ikke gyldig for en %u-bit %s-nøgle\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -9014,7 +9188,7 @@ msgstr "uden for kerne\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(dette er MD2-algoritmen)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "ingen"
 
@@ -9049,42 +9223,37 @@ msgstr ""
 "S/N %s, id 0x%08lX,\n"
 "oprettet %s, udløber %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen nøglebrug angivet - antager alle mulige brug\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "fejl ved indhentelse af nøglebrugsinformation: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certifikat burde ikke være brugt for certificering\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certifikat burde ikke være brugt for OCSP-svarunderskrivning\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certifikat burde ikke være brugt for kryptering\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certifikat burde ikke være brugt for underskrift\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikat kan ikke bruges til kryptering\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikat kan ikke bruges til underskrivning\n"
@@ -9289,6 +9458,11 @@ msgstr "Opret et designet tilbagekaldscertifikat for denne nøgle? (j/N) "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
+
 #: sm/certreqgen-ui.c:438
 #, fuzzy
 #| msgid "self-signed certificate has a BAD signature"
@@ -9373,125 +9547,125 @@ msgstr "sletning af certifikat »%s« mislykkedes: %s\n"
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige modtagere angivet\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "vis eksterne nøgler"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "vis certifikatkæde"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "importer certifikater"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "eksporter certifikater"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "registrer et smartkort"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "send en kommando til dirmngr'en"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "opstart gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "opret base-64-kodet resultat"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "brug overhovedet ikke terminalen"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|antal certifikater der skal inkluderes"
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|tag politikinformation fra FIL"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "antag inddata er i PEM-format"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "antag inddata er i base-64-format"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "antag inddata er i binært format"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "opret base-64-kodet resultat"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|brug BRUGER-ID som hemmelig standardnøgle"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|tilføj nøglering til nøgleringslisten"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "hent manglende udstedercertifikater"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|brug kodnings-NAVN for PKCS#12-adgangsfraser"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "konsulter aldrig en CRL"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "kontroller ikke CRL'er for rodcertifikater"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "kontroller validitet med OCSP"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|antal certifikater der skal inkluderes"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|FILE|tag politikinformation fra FIL"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "kontroller ikke certifikatpolitikker"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "hent manglende udstedercertifikater"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "brug overhovedet ikke terminalen"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|FILE|skriv en servertilstandslog til FIL"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|brug chifferalgoritme NAVN"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FILE|skriv en revisionslog til FIL"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|brug beskedsammendragsalgoritme NAVN"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "kørselstilstand: spørg aldrig"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spørgsmål"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spørgsmål"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FILE|tilføj nøglering til nøgleringslisten"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|USER-ID|brug BRUGER-ID som hemmelig standardnøgle"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|brug denne nøgleserver til at slå nøgler op"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|brug chifferalgoritme NAVN"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAME|brug beskedsammendragsalgoritme NAVN"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|skriv en revisionslog til FIL"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm [options] [files]\n"
@@ -9506,31 +9680,31 @@ msgstr ""
 "Sign, check, encrypt eller decrypt med S/MIME-protokollen\n"
 "standardhandling afhænger af inddata\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 #| msgid "unknown validation model `%s'\n"
 msgid "unknown validation model '%s'\n"
 msgstr "ukendt valideringsmodel »%s«\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, 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:1662
+#: sm/gpgsm.c:1709
 #, 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:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ugyldig kommando (der er ingen implict kommando)\n"
@@ -9590,7 +9764,7 @@ msgstr "problem under gensøgning af certifikat: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "fejl ved lagring af flag: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Fejl - "
 
@@ -9628,7 +9802,7 @@ msgstr ""
 "\n"
 "%s%sEr du sikker på, at det er hvad du ønsker?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9680,7 +9854,7 @@ msgstr "[dato ikke angivet]"
 msgid "algorithm:"
 msgstr "algoritme: %s"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9688,17 +9862,17 @@ msgstr ""
 "ugyldig underskrift: attribut for beskedsammendag matcher ikke den "
 "beregnede\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "God underskrift fra"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "     også kendt som"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Dette er en kvalificeret underskrift\n"
@@ -10574,126 +10748,147 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, 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:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "shutdown the dirmngr"
 msgstr "send en kommando til dirmngr'en"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|FILE|skriv servertilstandslogge til FIL"
-
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-#| msgid "Quit without saving? (y/N) "
-msgid "run without asking a user"
-msgstr "Afslut uden at gemme? (j/N) "
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-#, fuzzy
-#| msgid "allow PKA lookups (DNS requests)"
-msgid "allow sending OCSP requests"
-msgstr "tillad PKA-opslag (DNS-forespørgsler)"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "Konfiguration for nøgleservere"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|brug nøgleserver på adressen"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr "Konfiguration for HTTP-servere"
+
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "brug systemets HTTP-proxyopsætning"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "Konfiguraiton af LDAP-servere der skal bruges"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|brug denne nøgleserver til at slå nøgler op"
+
+#: dirmngr/dirmngr.c:271
 #, 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:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 #, 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:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "Konfiguration for OCSP"
+
+#: dirmngr/dirmngr.c:281
+#, fuzzy
+#| msgid "allow PKA lookups (DNS requests)"
+msgid "allow sending OCSP requests"
+msgstr "tillad PKA-opslag (DNS-forespørgsler)"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr ""
+
+#: dirmngr/dirmngr.c:285
 #, fuzzy
 #| msgid "|URL|use keyserver at URL"
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|brug nøgleserver på adressen"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
-msgstr ""
-
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr ""
-
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10706,13 +10901,13 @@ msgstr ""
 "@\n"
 "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, 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:427
+#: dirmngr/dirmngr.c:461
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -10724,92 +10919,92 @@ msgstr ""
 "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
 "Hemmelig nøglehåndtering for GnuPG\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, 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:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] "
 msgstr "brug: gpgsm [tilvalg] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "konvertering fra »%s« til »%s« mislykkedes: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, 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:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "ugyldig fingeraftryk"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, 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:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "ikke tvunget"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -11020,103 +11215,103 @@ msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "allocating list item failed: %s\n"
 msgstr "modtagelse af linje mislykkedes: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, 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:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, 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:710
 #, 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:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11127,76 +11322,76 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "afsendelse af linje mislykkedes: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire failed: %s\n"
 msgstr "afsendelse af linje mislykkedes: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, 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:1720
+#: dirmngr/server.c:1727
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "start_cert_fetch failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_next_cert failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, 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:2977
+#: dirmngr/server.c:2984
 #, 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:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11248,7 +11443,7 @@ msgstr "certifikat er gyldigt\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certifikat burde ikke være brugt for underskrift\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "stille"
 
@@ -11352,305 +11547,154 @@ msgstr "afsendelse af linje mislykkedes: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "fejl under afsendelse af standardtilvalg: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Tilvalg der kontrollerer det diagnostiske resultat"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Tilvalg der kontrollerer konfigurationen"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Tilvalg nyttige for fejlsøgning"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Tilvalg der kontrollerer sikkerheden"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|udløb SSH-nøgler efter N sekunder"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|angive maksimal livsforløb for SSH-nøgle til N sekunder"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|angiv minimal krævet længde for nye adgangsfraser til N"
-
-#: tools/gpgconf-comp.c:580
-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"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|FILE|kontroller nye adgangsfraser mod mønstre i FIL"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|giv adgangsfrasen udløb efter N dage"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "tillad ikke genbrug af gamle adgangsfraser"
-
-#: tools/gpgconf-comp.c:596
-#, 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"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAME|krypter også til bruger-id-NAVN"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|opsæt e-post-aliasser"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "Konfiguration for nøgleservere"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL|brug nøgleserver på adressen"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "tillad PKA-opslag (DNS-forespørgsler)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MECHANISMS|brug MEKANISMER til at finde nøgler efter postadresser"
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "importer nøgler fra en nøgleserver"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-#| msgid "list and check key signatures"
-msgid "include the public key in signatures"
-msgstr "vis og kontroller nøgleunderskrifter"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "deaktiver al adgang til dirmngr"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAME|brug kodnings-NAVN for PKCS#12-adgangsfraser"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "kontroller ikke CRL'er for rodcertifikater"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Tilvalg der kontrollerer formatet for resultatet"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Tilvalg der kontrollerer interaktiviteten og tvang"
-
-#: tools/gpgconf-comp.c:978
-#, fuzzy
-#| msgid "Options controlling the security"
-msgid "Options controlling the use of Tor"
-msgstr "Tilvalg der kontrollerer sikkerheden"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "Konfiguration for HTTP-servere"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "brug systemets HTTP-proxyopsætning"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "Konfiguraiton af LDAP-servere der skal bruges"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "LDAP-serverliste"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "Konfiguration for OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
-msgid "Private Keys"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
-msgid "Smartcards"
+#: tools/gpgconf-comp.c:633
+msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
+#: tools/gpgconf-comp.c:637
+msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 #| msgid "Bad Passphrase"
 msgid "Passphrase Entry"
 msgstr "Ugyldig adgangsfrase"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 #| msgid "Component not found"
 msgid "Component not suitable for launching"
 msgstr "Komponent blev ikke fundet"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, 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:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Ekstern verifikation af komponent %s mislykkedes"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Bemærk at gruppespecifikationer ignoreres\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, 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:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
 msgstr "fejl i »%s«: %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "vis alle komponenter"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "kontroller alle programmer"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|vis indstillinger"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|ændr indstillinger"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|kontroller indstillinger"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "anvend globale standardværdier"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 #, fuzzy
 #| msgid "|FILE|take policy information from FILE"
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|tag politikinformation fra FIL"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 #, fuzzy
 #| msgid "get the configuration directories for gpgconf"
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "hent konfigurationsmapperne for gpgconf"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "vis global konfigurationsfil"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "kontroller global konfigurationsfil"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "opdater troværdighedsdatabasen"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 #, fuzzy
 #| msgid "list all components"
 msgid "reload all or a given component"
 msgstr "vis alle komponenter"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 #, fuzzy
 #| msgid "list all components"
 msgid "launch a given component"
 msgstr "vis alle komponenter"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 #, fuzzy
 #| msgid "list all components"
 msgid "kill a given component"
 msgstr "vis alle komponenter"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "aktiver ændringer ved kørselstid, hvis muligt"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgconf [options]\n"
@@ -11662,15 +11706,15 @@ msgstr ""
 "Syntaks: gpgconf [tilvalg]\n"
 "Håndter konfigurationsindstillinger for værktøjer i GnuPG-systemet\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Kræver en kompomentparameter"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Komponent blev ikke fundet"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "Ingen parameter tilladt"
 
@@ -11686,6 +11730,44 @@ msgstr ""
 "Syntaks: gpg-check-pattern [tilvalg] mønsterfil\n"
 "Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "fejl ved skrivning til midlertidig fil: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "brug en logfil for serveren"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|FILE|skriv en servertilstandslog til FIL"
+
+#, fuzzy
+#~| msgid "Quit without saving? (y/N) "
+#~ msgid "run without asking a user"
+#~ msgstr "Afslut uden at gemme? (j/N) "
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "tillad PKA-opslag (DNS-forespørgsler)"
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "importer nøgler fra en nøgleserver"
+
+#, fuzzy
+#~| msgid "list and check key signatures"
+#~ msgid "include the public key in signatures"
+#~ msgstr "vis og kontroller nøgleunderskrifter"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "Tilvalg der kontrollerer formatet for resultatet"
+
+#, fuzzy
+#~| msgid "Options controlling the security"
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Tilvalg der kontrollerer sikkerheden"
+
+#~ msgid "LDAP server list"
+#~ msgstr "LDAP-serverliste"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "anmoder om nøgle %s fra %s server %s\n"
 
@@ -11843,9 +11925,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "kunne ikke åbne %s for skrivning: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "fejl ved skrivning til »%s«: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "fejl ved læsning fra %s: %s\n"
 
@@ -12011,9 +12090,6 @@ msgstr ""
 #~ msgid "listen() failed: %s\n"
 #~ msgstr "listen() mislykkedes: %s\n"
 
-#~ msgid "do not grab keyboard and mouse"
-#~ msgstr "fang ikke tastatur og mus"
-
 #~ msgid "Error: URL too long (limit is %d characters).\n"
 #~ msgstr "Fejl: Adresse er for lang (begrænsningen er %d tegn).\n"
 
diff --git a/po/de.gmo b/po/de.gmo
index 04c29c6..3b5748d 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 31bac48..74b9265 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.1.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-11-23 10:54+0100\n"
-"PO-Revision-Date: 2021-11-18 16:50+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+0200\n"
+"PO-Revision-Date: 2022-04-25 18:05+0200\n"
 "Last-Translator: Werner Koch <wk@gnupg.org>\n"
 "Language-Team: German <de@li.org>\n"
 "Language: de\n"
@@ -140,8 +140,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Passwort:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "Keine Ãœbereinstimmung - bitte nochmal versuchen."
 
@@ -186,62 +186,92 @@ msgstr "Falsche PIN!"
 msgid "Bad Passphrase"
 msgstr "Falsches Passwort!"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr "Hinweis: Anfrage vom Webbrowser."
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr "Hinweis: Anfrage von einem anderen Rechner."
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "Fehler beim Holen der Karten-Seriennummer: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Bitte geben Sie das Passwort noch einmal ein:"
+
+#: agent/command.c:2423
+#, 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."
+
+#: agent/command.c:2553
+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."
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, 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:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "Fehler beim Holen der Karten-Seriennummer: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "Erkannte Karte hat die Seriennummer: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "Auf der Karte ist kein Authentisierungsschlüssel für SSH: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "keine passender Kartenschlüssel gefunden: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "Fehler beim Holen der Liste der Karten: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -250,25 +280,21 @@ msgstr ""
 "Ein SSH Processs möchte folgenden Schlüssel verwenden:%%0A  %s%%0A  "
 "(%s)%%0AErlauben Sie dies?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "Erlauben"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "Verweigern"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr ""
 "Bitte geben Sie das Passwort für den SSH-Schlüssel%%0A  %F%%0A  (%c)%%0Aein."
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Bitte geben Sie das Passwort noch einmal ein:"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -278,98 +304,93 @@ msgstr ""
 "Schlüssel%%0A   %s%%0A  %s%%0Aim Schlüsselspeicher des Gpg-Agenten zu "
 "schützen."
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "Bitte legen Sie die Karte mit der folgenden Seriennummer ein"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 "Bitte entfernen Sie die vorhanden Karte und legen Sie die mit der folgenden "
 "Seriennummer ein:"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "Admin-PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Rückstellcode"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr "Bitte die Bestätigungstaste des Tokens drücken."
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr "Zur Eingabe die Tastatur des Kartenlesers verwenden."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Rückstellcode bitte wiederholen"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "PUK bitte wiederholen"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "PIN bitte wiederholen"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Rückstellcode wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Bitte geben Sie die PIN%s%s%s ein, um die Karte zu entsperren"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
+#: agent/genkey.c:157
 #, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "Fehler beim Schreiben auf eine \"Pipe\": %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Neues Passwort eingeben"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "Diese trotzdem benutzen"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "Sie haben kein Passwort eingegeben!%0AEine leeres Passwort ist nicht erlaubt."
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -379,18 +400,18 @@ msgstr ""
 "Bitte bestätigen Sie, daß sie auf den lokalen Schutz Ihres privaten\n"
 "Schlüssels verzichten."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Ja, ein Schutz ist nicht notwendig"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Ein Passwort sollte mindestens %u Zeichen lang sein."
 msgstr[1] "Ein Passwort sollte mindestens %u Zeichen lang sein."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -400,161 +421,227 @@ msgstr[0] ""
 msgstr[1] ""
 "Ein Passwort sollte mindestens %u Sonderzeichen oder Ziffern enthalten."
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Ein Passwort sollte kein bekanntes Wort sein oder nach bekannten Regeln "
 "aufgebaut sein."
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "WARNUNG: Sie haben ein offensichtlich unsicheres Passwort eingegeben."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Bitte geben Sie das Passwort ein,%0Aum Ihren Schlüssel zu schützen."
 
-#: agent/genkey.c:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Bitte geben Sie das Passwort ein:"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Optionen:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
+msgstr "Optionen zum Start des Programms"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr "Im \"Supervised\" Modus ausführen"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "Detaillierte Informationen"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "Reduzierte Informationen"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "Im Vordergrund laufen lassen"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Optionen zur Einstellung der Diagnoseausgaben"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "Logausgaben in eine Datei umlenken"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|Benutze PGM as PIN-Entry"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "Reduzierte Informationen"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|Benutze PGM als SCdaemon"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Optionen zur Einstellung der Konfiguration"
+
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "Den SCdaemon-basierten Kartenzugriff nicht nutzen"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|Benutze PGM als SCdaemon"
+
+#: agent/gpg-agent.c:213
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|Einige Kommandos über NAME annehmen"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "Ignoriere Anfragen, das TTY zu wechseln"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "SSH Unterstützung einschalten"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "Verwende ALGO für SSH Fingerabdrücke"
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "PuTTY Unterstützung einschalten"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Optionen zur Einstellung der Sicherheit"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|Lösche unbenutzte Passwörter nach N Sekunden aus dem Cache"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|Lösche unbenutzte SSH Passwörter nach N Sekunden aus dem Cache"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|Lösche Passwörter nach N Sekunden aus dem Cache"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|Lösche SSH Passwörter nach N Sekunden aus dem Cache"
+
+#: agent/gpg-agent.c:248
 msgid "do not use the PIN cache when signing"
 msgstr "Benutze den Passwort Cache nicht beim Signieren"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:250
 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:252
 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:257
 msgid "allow presetting passphrase"
 msgstr "Erlaube ein \"preset\" der Passwörter"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Optionen für Passwort Regeln"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "Einhaltung der Passwort Regeln erzwingen"
+
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|setze die kleinste erlaubte Länge von Passwörtern auf N"
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|N|Verlange mindestens N Nicht-Buchstaben für ein neues Passwort"
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|DATEI|Prüfe neue Passwörter gegen die Regeln in DATEI"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|Lasse das Passwort nach N Tagen verfallen"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "Verbiete die Wiedernutzung alter Passwörter."
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
+msgstr "Optionen für das Pinentry"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
+msgstr "Niemals das Pinentry benutzen"
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr "Aufrufer darf das Pinentry nicht ersetzen"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
-msgstr "Erlaube die Eingabe eines Passwortes über Emacs"
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr "Tastatur und Maus \"grabben\""
 
-#: agent/gpg-agent.c:258
-msgid "enable ssh support"
-msgstr "SSH Unterstützung einschalten"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|Benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "Verwende ALGO für SSH Fingerabdrücke"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|Setze die Pinentry Zeitüberschreitung auf N Sekunden"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "PuTTY Unterstützung einschalten"
+#: agent/gpg-agent.c:298
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "Erlaube die Eingabe eines Passwortes über Emacs"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Gebrauch: @GPG_AGENT@ [Optionen] [Kommando [Argumente]]"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -562,135 +649,143 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Der Name des Sockets `%s' ist zu lang\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "Versuche den Socket des laufenden %s zu übernehmen\n"
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, 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:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, 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:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, 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:2739
+#: agent/gpg-agent.c:2721
 #, 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:2744
+#: agent/gpg-agent.c:2726
 #, 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:2819
+#: agent/gpg-agent.c:2801
 #, 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:2824
+#: agent/gpg-agent.c:2806
 #, 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:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "Der gpg-agent läuft nicht für diese Session\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Optionen:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Aufruf: gpg-preset-passphrase [Optionen] KEYGRIP (-h für Hilfe)\n"
@@ -703,8 +798,8 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
 "Pflege des Passwortpuffers\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -712,9 +807,8 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -771,46 +865,46 @@ msgstr "Vom Benutzer abgebrochen\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Fehler bei der Abfrage des Passwortes: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "Fehler beim Öffnen von `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "Datei `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr ""
 "Anweisung \"%s\" in `%s', Zeile %d\n"
 " ignoriert\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr ""
 "Systemliste der vertrauenswürdigen Zertifikate '%s' ist nicht vorhanden\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "fehlerhafter Fingerabdruck in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "Ungültiges Schlüsselflag in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "Fehler beim Lesen von `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "Fehler beim Lesen der Liste vertrauenswürdiger Wurzelzertifikate\n"
@@ -823,7 +917,7 @@ msgstr "Fehler beim Lesen der Liste vertrauenswürdiger Wurzelzertifikate\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -833,11 +927,11 @@ msgstr ""
 "\"%%0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja"
 "\"."
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "Nein"
@@ -850,7 +944,7 @@ msgstr "Nein"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -862,22 +956,22 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "Falsch"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Hinweis: Dieses Passwort wurde noch nie geändert.%0ABitte ändern Sie es "
 "jetzt."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -886,15 +980,15 @@ msgstr ""
 "Dieses Passwort wurde seit dem %.4s-%.2s-%.2s nicht%%0A\n"
 "mehr geändert.  Bitte ändern Sie sie jetzt."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Das Passwort ändern"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "Ich werde sie später ändern"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -903,11 +997,11 @@ msgstr ""
 "Möchten Sie den Schlüssel mit dem \"Keygrip\"%%0A  %s%%0A  %%C%%0Awirklich "
 "entfernen?"
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "Schlüssel löschen"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -942,7 +1036,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "Public-Key-Verfahren %d (%s) wird nicht unterstützt\n"
@@ -957,52 +1051,52 @@ msgstr "Schutzverfahren %d (%s) wird nicht unterstützt\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "Schutzverfahrenshash %d (%s) wird nicht unterstützt\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "Fehler beim Erzeugen eines \"streams\" zu einer \"pipe\": %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "Fehler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "Fehler bei Ausführung von `%s': beendet\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "Das Warten auf die Beendigung von Prozessen schlug fehl: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
@@ -1032,12 +1126,12 @@ msgstr "WARNUNG: Unsichere Besitzrechte für %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte für %s \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "Warte bis auf die Datei '%s' zugegriffen werden kann ...\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "umbenennen von `%s' nach `%s' schlug fehl: %s\n"
@@ -1098,22 +1192,22 @@ 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:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: Die Option \"%s\" is veraltet - sie hat keine Wirkung\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "Unbekanntes Debug Flag '%s' wird ignoriert\n"
@@ -1415,7 +1509,7 @@ msgstr "Ungültige Option"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "Fehlendes Argument für Option \"%.50s\"\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "Ungültiges Argument für Option \"%.50s\"\n"
@@ -1445,17 +1539,17 @@ msgstr "Befehl \"%.50s\" ist mehrdeutig\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "Ungültige Option \"%.50s\"\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1476,41 +1570,41 @@ msgstr "iconv_open fehlgeschlagen: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "Umwandlung von `%s' in `%s' schlug fehl: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "Die temporäre Datei `%s' kann nicht erstellt werden: %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "eine übriggebliebene Sperrdatei wird entfernt (erzeugt von %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "warte auf die Freigabe der Sperre (gehalten von %d%s) %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(Deadlock?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "Dateisperre %s konnte nicht eingerichtet werden: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, 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"
@@ -1738,22 +1832,22 @@ msgstr "HTTP Weiterleitung wurde gesäubert"
 msgid "server uses an invalid certificate"
 msgstr "Der Server benutzt eine ungültiges Zertifikat"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, c-format
 msgid "Note: %s\n"
 msgstr "Hinweis: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, 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:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1769,8 +1863,8 @@ msgstr "Dieser Befehl ist nur für Karten ab Version 2 möglich.\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1780,121 +1874,121 @@ msgstr "Ihre Auswahl? "
 msgid "[not set]"
 msgstr "[nicht gesetzt]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr "Hr."
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr "Fr."
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "nicht zwingend"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "URL um den öffentlichen Schlüssel zu holen: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Anrede (M=Hr., F=Fr. oder Leerzeichen): "
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ungültige Antwort.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schlüsseloperation nicht möglich: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "Keine gültige OpenPGP-Karte"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1906,100 +2000,100 @@ msgstr ""
 "         fehlschlagen, so ziehen Sie bitte die Dokumentation Ihrer Karte\n"
 "         zu Rate.\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr "Ändern des Schlüsselattributs für den: "
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 msgid "Signature key\n"
 msgstr "Signatur-Schlüssel\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 msgid "Encryption key\n"
 msgstr "Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr "Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 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:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2010,167 +2104,167 @@ msgstr ""
 "   PIN = '%s'     Admin-PIN = '%s'\n"
 "Sie sollten sie mittels des Befehls --change-pin ändern\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 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:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signatur-Schlüssel\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 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:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Das KEYTOCARD Kommando schlug fehl: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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 "
+"Hinweis: Dieses Kommando zerstört alle auf der Karte gespeicherten "
 "Schlüssel!\n"
 
-#: g10/card-util.c:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr "Fortsetzen? (j/N) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Möchten Sie die Karte wirklich komplett löschen? (\"yes\" eingeben) "
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "Fehler beim Einstellen der KDF: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "Zeige Admin-Befehle"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen ändern"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "Schlüssel-holen-URL ändern"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "Holen des Schlüssels mittels der URL auf der Karte"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "Ändern der Logindaten"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "Ändern der Spracheinstellungen"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr "Ändern der Anrede des Kartenbesitzers"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "Ändern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "Umschalten des \"Signature-force-PIN\"-Schalters"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "neue Schlüssel erzeugen"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "Menü für Ändern oder Entsperren der PIN"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "überprüfe die PIN und liste alle Daten auf"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "die PIN mit dem Rückstellcode wieder freigeben"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr "alle Schlüssel und Daten löschen"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr "Einrichten der KDF zur Authentifizierung"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 msgid "change the key attribute"
 msgstr "Das Schlüsselattribut ändern"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2235,8 +2329,8 @@ msgid "subkey"
 msgstr "Unterschlüssel"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
@@ -2281,25 +2375,25 @@ msgstr ""
 msgid "using cipher %s\n"
 msgstr "benutze Cipher %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "Das Verschlüsselungsverfahren %s darf im %s Modus nicht verwendet werden.\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s Modus nicht erlaubt.\n"
@@ -2323,7 +2417,13 @@ msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr ""
 "WARNUNG: Schlüssel %s ist zur Verschlüsselung im %s Modus nicht geeignet.\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr "Operation abgebrochen wegen nicht erfüllter Compliance.\n"
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2332,41 +2432,41 @@ msgstr ""
 "WARNUNG: Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
 "Empfängervoreinstellungen.\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) "
 "verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschlüsselt für: %s\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "Die Benutzung der Option \"%s\" ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschlüsselte Daten\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "WARNUNG: Botschaft wurde mit einem unsicheren Schlüssel verschlüsselt.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "Problem beim Bearbeiten des verschlüsselten Pakets\n"
@@ -2554,212 +2654,262 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "der Unterschlüssel %s wird anstelle des Hauptschlüssels %s verwendet\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "Gültige Argumente für Option '%s':\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "Eine Signatur erzeugen"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "Eine Klartextsignatur erzeugen"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Signatur erzeugen"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "Signaturen der Schlüssel auflisten und prüfen"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "Schnell ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr "Schnell eine neue User-ID anfügen"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr "Schnell eine User-ID widerrufen"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr "Schnell ein neues Ablaufdatum setzen"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "Schlüssel schnell signieren"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "Schlüssel schnell nur für diesen Rechner signieren"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "quickly revoke a key signature"
 msgstr "Schnell eine Schlüsselsignatur widerrufen"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "Schlüssel nur für diesen Rechner signieren"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "Signieren oder bearbeiten eines Schlüssels"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "Das Passwort ändern"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "Schlüssel auf einem Schlü.server suchen"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "alle Schlüssel per Schlü.server aktualisieren"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "Daten auf einer Karte ändern"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "PIN einer Karte ändern"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "Hashwerte für die Dateien ausgeben"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|WERT|Setze die TOFU-Politik für einen Schlüssel"
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|Auch an NAME verschlüsseln"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|Email Alias festlegen"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "OpenPGP-Verhalten strikt beachten"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "Keine wirklichen Änderungen durchführen"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "vor Ãœberschreiben nachfragen"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr "Optionen für die Eingabe"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr "Optionen für die Ausgabe"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|USER-ID|Verschlüsseln für USER-ID"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|DATEI|Ausgabe auf DATEI schreiben"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "Textmodus benutzen"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr "Optionen für den Schlüsselimport und -export"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|DATEI|Ausgabe auf DATEI schreiben"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
+"|MECHANISMEN|Benutze MECHANISMEN um Schlüssel über die Mailadresse "
+"aufzufinden."
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "Keine wirklichen Änderungen durchführen"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "Jeglichen Zugriff auf den Dirmngr verhindern"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "vor Ãœberschreiben nachfragen"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr "Optionen für das Auflisten der Schlüssel"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "OpenPGP-Verhalten strikt beachten"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+msgid "Options to specify keys"
+msgstr "Optionen zur Auswahl der Schlüssel"
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|Verschlüsseln für USER-ID"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr "Optionen für die Verwendung in Scripts"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr "Weitere Optionen"
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2768,7 +2918,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
 "Optionen)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2788,11 +2938,11 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Aufruf: @GPG@ [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2802,7 +2952,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2810,75 +2960,75 @@ msgstr ""
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Öff. Schlüssel: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "Aufruf: %s [Optionen] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2886,20 +3036,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei '%s'\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2907,462 +3057,462 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei '%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "Richtlinien-URL mit den Signaturen anlisten"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "Standard Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "Benutzer-Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "Unbekannte TOFU Regel '%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieser Befehl ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" ist keine gültige E-Mailadresse\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "Ungültiger Subjekt-Name '%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "Ungültiges \"Herkunft\"-Argument '%s'\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "Ungültige Filter-Option: %s\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "Foto-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 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:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 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:3287
+#: g10/gpg.c:3286
 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:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "Werte das Vertrauen zu Signaturen durch gültige PKA-Daten auf"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, 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:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, 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:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, 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:3839
+#: g10/gpg.c:3837
 #, 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:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "Fehler in der Schlüsselangabe '%s': %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, 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:5134
+#: g10/gpg.c:5132
 #, 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:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
@@ -3375,7 +3525,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
@@ -4092,7 +4242,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht möglich.\n"
 
@@ -4270,8 +4420,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:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -4470,7 +4620,7 @@ msgstr ""
 "Signaturen\n"
 " (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Schlüssel wurde widerrufen."
 
@@ -4518,7 +4668,7 @@ msgstr "Diese User-ID wirklich entfernen? (j/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Den Hauptschlüssel wirklich verschieben? (j/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "Sie müssen genau einen Schlüssel auswählen.\n"
 
@@ -4597,161 +4747,161 @@ msgstr "Änderungen speichern? (j/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? (j/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Die letzte User-ID kann nicht widerrufen werden!\n"
 
-#: g10/keyedit.c:2476
+#: g10/keyedit.c:2532
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "Fehler beim Widerrufen der User-ID: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "Fehler beim Setzen der Haupt-User-ID: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" ist kein Fingerabdruck\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" ist nicht der Fingerabdruck des Hauptschlüssels\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Ungültige User-ID '%s': %s\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "Keine passende User-ID"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "Nichts zu beglaubigen\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nicht von Ihnen signiert.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "Fehler beim Widerruf der Schlüsselsignatur: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' ist kein gültiges Ablaufdatum\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" ist kein gültiger Fingerabdruck\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "Unterschlüssel \"%s\" nicht gefunden\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Bevorzugter Schlüsselserver:"
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "\"Notationen\": "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Der folgende Schlüssel wurde am %s von %s Schlüssel %s widerrufen\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Dieser Schlüssel kann von %s-Schlüssel %s widerrufen werden"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "erzeugt: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "widerrufen: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "verfallen: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "verfällt: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "Nutzung: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "Kartennummer:"
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "Vertrauen: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "Gültigkeit: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4759,18 +4909,18 @@ msgstr ""
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "widerrufen"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "verfallen"
 
 # translated by wk
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4779,17 +4929,17 @@ msgstr ""
 "WARNUNG: Keine User-ID ist als primär markiert.  Dieser Befehl kann\n"
 "dazu führen, daß eine andere User-ID als primär angesehen wird.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNUNG: Ihr Unterschlüssel zum Verschlüsseln wird bald verfallen.\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Bitte erwägen Sie, dessen Verfallsdatum auch zu ändern.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4799,72 +4949,72 @@ msgstr ""
 "könnte\n"
 "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Solch eine User-ID ist bereits für den Schlüssel vorhanden!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d Beglaubigung entfernt.\n"
 msgstr[1] "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "ungültig"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User-ID \"%s\": %d Signatur entfernt\n"
 msgstr[1] "User-ID \"%s\": %d Signaturen entfernt\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User-ID \"%s\": bereits minimiert\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User-ID \"%s\": bereits sauber\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4874,221 +5024,221 @@ msgstr ""
 "         Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
 "         des Schlüssels führen.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie können einem PGP2-artigen Schlüssel keine vorgesehenen Widerrufer "
 "hinzufügen.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht rückgangig gemacht werden!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer festlegen? "
 "(j/N): "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 "Möchten Sie wirklich die Verfallsdaten aller Unterschlüssel ändern? (j/N): "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 msgid "Changing usage of a subkey.\n"
 msgstr "Ändern des Schlüsselverwendungszweckes des Unterschlüssels.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 msgid "Changing usage of the primary key.\n"
 msgstr "Ändern des Schlüsselverwendungszweckes des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "Unterschlüssel %s ist des Signieren nicht mächtig und braucht deshalb keine "
 "Rücksignatur\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Ãœberspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Geben Sie die \"Notation\" ein: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Fortfahren (j/N)? "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Hash %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Kein Unterschlüssel mit Schlüssel-ID '%s'.\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kein Unterschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \"%s\"\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Signatur ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (unwiderrufbar)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, 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:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Die letzte User-ID kann nicht widerrufen werden!\n"
 
-#: g10/keyedit.c:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Schlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Unterschlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5546,7 +5696,7 @@ msgstr ""
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
@@ -5615,11 +5765,11 @@ msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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"
@@ -5628,7 +5778,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5636,7 +5786,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5644,22 +5794,22 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? (j/N) "
 
@@ -5868,85 +6018,85 @@ msgstr "fordere Schlüssel von %s an\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Seltsame Länge für einen verschlüsselten Sitzungsschlüssel (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s verschlüsselter Sitzungsschlüssel\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Das Passwort wurde mit unbekanntem Hashverfahren %d erstellt\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "Öffentlicher Schlüssel ist %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schlüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %s, erzeugt %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Verschlüsselt mit %lu Passwörtern\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Verschlüsselt mit einem Passwort\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschlüsselte Daten\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 "WARNUNG: Botschaft wurde nicht integritätsgeschützt (integrity protected)\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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"
@@ -5956,184 +6106,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:799
+#: g10/mainproc.c:853
 #, 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:804
+#: g10/mainproc.c:858
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "Entschlüsselungs-Fehler erzwungen!\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "Entschlüsselung erfolgreich\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNUNG: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "Keine Signatur gefunden\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Signatur von \"%s\""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Signatur von \"%s\""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Signatur von \"%s\""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "Signaturüberprüfung unterdrückt\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "diese mehrdeutige Signaturdaten können nicht bearbeitet werden\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur vom %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               mittels %s-Schlüssel %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               Aussteller \"%s\"\n"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Schlüssel erhältlich bei: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, 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:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[ungewiß]  "
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \"%s\""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Signatur ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Signatur verfällt am %s.\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s Signatur, Hashmethode %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "Binäre"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ", Schlüsselverfahren "
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, 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:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Signatur kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Signatur\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Signatur der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Signatur nach alter (PGP 2.x) Art\n"
@@ -6202,34 +6352,34 @@ msgstr "(gemeldeter Fehler: %s <%s>)\n"
 msgid "(further info: "
 msgstr "(weitere Infos: "
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mißbilligte Option \"%s\".\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "WARNUNG: \"%s\" ist ein nicht ratsamer Befehl - verwenden Sie ihn nicht.\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 "%s:%u: Die Option \"%s\" is veraltet - sie hat eine Wirkung nur in %s.\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@ -6237,38 +6387,38 @@ msgstr ""
 "WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat eine Wirkung nur\n"
 "in %s.\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Diese Botschaft könnte für %s unbrauchbar sein\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "Unbekannte Option '%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "Der öffentliche ECDSA Schlüssel muß ein Vielfaches von 8 Bit als Länge "
 "haben\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "Unbekanntes schwache Hashverfahren '%s'\n"
@@ -6301,24 +6451,24 @@ msgstr "Schreiben auf die Standardausgabe\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "WARNUNG: Möglicherweise unsicherer symmetrisch verschlüsselter "
 "Sitzungsschlüssel\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Unbekannte Entscheidende Beglaubigungs-\"Notation\": "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -6752,12 +6902,12 @@ msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Hinweis: Schlüssel %s besitzt nicht die %s Eigenschaft\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
@@ -7209,7 +7359,7 @@ msgstr ""
 "Dies ist ein durch PGP erzeugter Elgamal-Schlüssel. Das ist für Signaturen "
 "NICHT sicher genug!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "Vertrauenssatz %lu, Typ %d: Schreiben fehlgeschlagen: %s\n"
@@ -7254,7 +7404,7 @@ msgstr "Fehler beim Suchen des \"Trust records\" in `%s': %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "Lesefehler in `%s': %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
@@ -7792,98 +7942,98 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' ist keine gültige lange Schlüssel-ID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "Schlüssel %s: Als vertrauenswürdiger Schlüssel akzeptiert\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "Schlüssel %s tritt mehr als einmal in der \"trustdb\" auf\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "Schlüssel %s: kein öffentlicher Schlüssel für den vertrauenswürdigen "
 "Schlüssel - übersprungen\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Schlüssel %s ist als ultimativ vertrauenswürdig gekennzeichnet\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 "Sie können versuchen die Vertrauensdatenbank durch folgende Befehle\n"
 "wiederherzustellen:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Falls dies nicht funktioniert, sehen Sie bitte im Handbuch nach\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "kann unbekanntes Vertrauensmodell nicht verwenden (%d) - verwende "
 "Vertrauensmodell %s\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "verwende Vertrauensmodell %s\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "\"Trust-DB\"-Überprüfung ist beim `%s'-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "\"Trust-DB\"-Änderung ist beim `%s'-Vertrauensmodell nicht nötig\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "Bitte ein --check-trustdb durchführen\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird überprüft\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -7891,24 +8041,24 @@ msgstr[0] "%d Schlüssel bislang bearbeitet"
 msgstr[1] "%d Schlüssel bislang bearbeitet"
 
 # translated by wk
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, 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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "keine ultimativ vertrauenswürdigen Schlüssel gefunden\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7916,30 +8066,30 @@ msgstr ""
 "Tiefe: %d  gültig: %3d  signiert: %3d  Vertrauen: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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"
 
@@ -7951,39 +8101,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 ]"
 
@@ -8031,19 +8181,19 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNummer: %s%%0ABesitzer: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Verbliebene Versuche: %d"
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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 "
@@ -8051,16 +8201,16 @@ 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Bitte die Admin-PIN eingeben."
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Bitte die PIN für den Standard-Schlüssel eingeben."
 
@@ -8133,7 +8283,7 @@ msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
@@ -8198,7 +8348,7 @@ msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
@@ -8339,7 +8489,7 @@ msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8347,7 +8497,7 @@ msgstr ""
 "Die Überprüfung der Admin PIN ist momentan durch einen Befehl verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -8363,55 +8513,55 @@ msgstr "||Bitte die PIN auf der Tastatur des Kartenlesers eingeben"
 msgid "|N|Initial New PIN"
 msgstr "|N|Erstmalige neue PIN"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "Im Multiserver Modus ausführen"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|DATEI|Schreibe Logs auf DATEI"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|Verbinde mit dem Leser auf Port N"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|Benutze NAME als CT-API Treiber"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|Benutze NAME als PC/SC Treiber"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "Den internen CCID Treiber nicht benutzen"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|Schalte die Karte nach N Sekunden Inaktivität ab"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "Die Tastatur des Kartenlesers nicht benutzen"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "Verweigere die Benutzung von \"Admin\"-Befehlen"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "Variable Längeneingabe für die Kartenlesertastatur benutzen"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "Verweigere die Benutzung von \"Admin\"-Befehlen"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Gebrauch: @SCDAEMON@ [Optionen] (-h für Hilfe)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8419,23 +8569,29 @@ msgstr ""
 "Syntax: @SCDAEMON@ [Optionen] [Befehl [Argumente]]\n"
 "Smartcard Daemon für @GNUPG@\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "Bitte die Option `--daemon' nutzen, um das Programm im Hintergund "
 "auszuführen\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "Handhabungsroutine für fd %d gestartet\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "Handhabungsroutine für den fd %d beendet\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8493,7 +8649,7 @@ msgstr "Der Herausgeber wird von einer externen Stelle gesucht\n"
 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:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "authorityInfoAccess kann nicht geholt werden: %s\n"
@@ -8661,7 +8817,7 @@ msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
 msgid "checking the trust list failed: %s\n"
 msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "Der Zertifikatkette ist zu lang\n"
@@ -8718,7 +8874,7 @@ msgstr ""
 "Ein %u-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8729,7 +8885,7 @@ msgstr "Nicht genügend Speicher\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(Dies ist der MD2 Algorithmus)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "keine"
 
@@ -8765,45 +8921,40 @@ msgstr ""
 "gültig von %s bis %s\n"
 "zu entsperren.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 "Schlüsselverwendungszweck nicht vorhanden - für alle Zwecke akzeptiert\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "Das Zertifikat hätte nicht zum Zertifizieren benutzt werden sollen\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 "Das Zertifikat hätte nicht zum Signieren von OCSP Antworten benutzt werden "
 "sollen\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "Das Zertifikat hätte nicht zum Verschlüsseln benutzt werden sollen\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "Das Zertifikat hätte nicht zum Signieren benutzt werden sollen\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "Das Zertifikat kann nicht zum Verschlüsseln benutzt werden\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "Das Zertifikat kann nicht zum Signieren benutzt werden\n"
@@ -8992,6 +9143,11 @@ msgstr "Ein eigenbeglaubigtes Zertifikat erzeugen? (j/N) "
 msgid "These parameters are used:\n"
 msgstr "Verwendete Parameter:\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "Das eigenbeglaubigte Zertifikat wird erzeugt.  "
@@ -9069,123 +9225,123 @@ msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
 msgid "no valid recipients given\n"
 msgstr "Keine gültigen Empfänger angegeben\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "Externe Schlüssel anzeigen"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "Schlüssel mit Zertifikatekette anzeigen"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "Zertifikate importieren"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "Zertifikate exportieren"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "Smartcard registrieren"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "Das Kommando an den Dirmngr durchreichen"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "Rufe das gpg-protect-tool auf"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "Ausgabe im Basis-64 Format erzeugen"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "das Terminal gar nicht benutzen"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|Sende N Zertifikate mit"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "Eingabedaten sind im PEM Format"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "Eingabedaten sind im Basis-64 Format"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "Eingabedaten sind im Binärformat"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "Ausgabe im Basis-64 Format erzeugen"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|DATEI|DATEI als öffentlichen Schlüsselbund mitbenutzen"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "Fehlende Zertifikate automatisch holen"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passwörter"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "Niemals eine CRL konsultieren"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "Die Gültigkeit mittels OCSP prüfen"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|Sende N Zertifikate mit"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "Zertifikatsrichtlinien nicht überprüfen"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "Fehlende Zertifikate automatisch holen"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "das Terminal gar nicht benutzen"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|DATEI|DATEI als öffentlichen Schlüsselbund mitbenutzen"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAME|Hashverfahren NAME benutzen"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Aufruf: @GPGSM@ [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9194,27 +9350,27 @@ msgstr ""
 "Syntax: @GPGSM@ [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
@@ -9274,7 +9430,7 @@ msgstr "Problem bei Wiederfinden des Zertifikats: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "Fehler beim Speichern der Flags: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Fehler - "
 
@@ -9312,7 +9468,7 @@ msgstr ""
 "\n"
 "%s%sSind Sie wirklich sicher, daß Sie dies möchten?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9365,7 +9521,7 @@ msgstr "[Datum nicht vorhanden]"
 msgid "algorithm:"
 msgstr "Verfahren:"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9373,17 +9529,17 @@ msgstr ""
 "Ungültige Signatur: Nachricht entspricht nicht dem Prüfwert in der "
 "Nachricht.\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Korrekte Signatur von"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "                alias"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Dies ist eine qualifizierte Signatur.\n"
@@ -10193,112 +10349,135 @@ msgstr "Absoluter Dateiname erwartet\n"
 msgid "looking up '%s'\n"
 msgstr "Auffinden von `%s'\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "Den Inhalt des CRL Zwischenspeichers anzeigen"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|DATEI|Lade die CRL aus der DATEI in den Zwischenspeicher"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|Hole eine CRL von dieser URL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "Den Dirmngr herunterfahren"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "Den Zwischenspeicher löschen"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr "Online Softwareversionstest erlauben"
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "Ausführung ohne Benutzernachfrage"
+#: dirmngr/dirmngr.c:218
+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:196
-msgid "force loading of outdated CRLs"
-msgstr "Laden von abgelaufenen CRLs erzwingen"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr "Netzwerkbezogene Optionen"
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "OCSP Anfragen erlauben"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
+msgstr "Netzzugriff nur über Tor"
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
-msgstr "Online Softwareversionstest erlauben"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "Konfiguration der Schlüsselserver"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "Benutze Schlüsselserver unter der URL"
+
+#: dirmngr/dirmngr.c:244
+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:247
+msgid "Configuration for HTTP servers"
+msgstr "Konfiguration für HTTP Server"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "Sperre die Benutzung von HTTP"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "Sperre die Benutzung von LDAP"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr "Ãœbergehe HTTP CRL Distribution Points"
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
-msgstr "Ãœbergehe LDAP CRL Distribution Points"
-
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "Ãœbergehe im Zertifikat enthaltene OCSP Service URLs"
-
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|Leite alle HTTP Anfragen über URL"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "Benutze die HTTP Proxy Einstellung des Systems"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "Konfiguration der zu nutzenden LDAP-Server"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "Sperre die Benutzung von LDAP"
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr "Ãœbergehe LDAP CRL Distribution Points"
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|Benutze HOST für LDAP Anfragen"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "Keine Benutzung der Rückgriffshosts mit --ldap-proxy"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 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:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|Setze die LDAP Zeitüberschreitung auf N Sekunden"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "Konfiguration zu OCSP"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "OCSP Anfragen erlauben"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "Ãœbergehe im Zertifikat enthaltene OCSP Service URLs"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|Benutze den OCSP Responder mit dieser URL"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
 
-#: dirmngr/dirmngr.c:235
-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:240
-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
-msgid "route all network traffic via Tor"
-msgstr "Netzzugriff nur über Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "Laden von abgelaufenen CRLs erzwingen"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10308,11 +10487,11 @@ msgstr ""
 "(Im \"info\"-Handbuch findet sich eine vollständige Liste aller Kommandos "
 "und Optionen)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Gebrauch: @DIRMNGR@ [Optionen]"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10320,85 +10499,85 @@ msgstr ""
 "Syntax: @DIRMNGR@ [Optionen] [Kommando [Argumente]]\n"
 "Keyserver, CRL und OCSP Zugriff für @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "Gültige Debugebenen sind: %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "Aufruf: %s [Optionen] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: ungültiger Fingerabdruck erkannt\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: Lesefehler: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, 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:1955
+#: dirmngr/dirmngr.c:1949
 #, 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:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "Herunterfahren wurde erzwungen\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "Signal %d empfangen - keine Aktion definiert\n"
@@ -10588,92 +10767,92 @@ msgstr "Hashen der OCSP Antwort für `%s' fehlgeschlagen: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "Nicht durch voreingestelltes OCSP \"Signer-Zertifikat\" signiert"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "malloc() fehlgeschlagen: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, 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:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "Kein  voreingestellter OCSP Responder definiert\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "Kein voreingestellter OCSP \"Signer\" definiert\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:705
 #, 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:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "Der OCSP Responder `%s' wird benutzt\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, 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:792
 #, 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:793
 msgid "good"
 msgstr "Gut"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, 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:846
 #, 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:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP Responder gab einen zu alten Status zurück\n"
@@ -10683,67 +10862,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:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "Seriennummer fehlt in der Cert-ID"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url() fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "Fehler beim Senden der Daten: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d überschritten\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "Fehler beim Initialisieren des Servers: %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept Problem: %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@ -10789,7 +10968,7 @@ msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 "Das Zertifikat hätte nicht zum Signieren einer CRL benutzt werden sollen\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "Reduzierte Informationen"
 
@@ -10882,277 +11061,132 @@ msgstr "Senden der Zeile schlug fehl: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "Fehler beim Senden der Standardoptionen: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Optionen zur Einstellung der Diagnoseausgaben"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Optionen zur Einstellung der Konfiguration"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Nützliche Optionen zur Fehlersuche"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Optionen zur Einstellung der Sicherheit"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|Lösche unbenutzte SSH Passwörter nach N Sekunden aus dem Cache"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|Lösche Passwörter nach N Sekunden aus dem Cache"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|Lösche SSH Passwörter nach N Sekunden aus dem Cache"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Optionen für Passwort Regeln"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "Einhaltung der Passwort Regeln erzwingen"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|setze die kleinste erlaubte Länge von Passwörtern auf N"
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr "|N|Verlange mindestens N Nicht-Buchstaben für ein neues Passwort"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|DATEI|Prüfe neue Passwörter gegen die Regeln in DATEI"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|Lasse das Passwort nach N Tagen verfallen"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "Verbiete die Wiedernutzung alter Passwörter."
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|Setze die Pinentry Zeitüberschreitung auf N Sekunden"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAME|Auch an NAME verschlüsseln"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|Email Alias festlegen"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "Konfiguration der Schlüsselserver"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "Benutze Schlüsselserver unter der URL"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-"|MECHANISMEN|Benutze MECHANISMEN um Schlüssel über die Mailadresse "
-"aufzufinden."
-
-#: tools/gpgconf-comp.c:764
-msgid "import missing key from a signature"
-msgstr "Schlüssel aus der Signatur importieren"
-
-#: tools/gpgconf-comp.c:767
-msgid "include the public key in signatures"
-msgstr "Schlüssel mit in die Signatur packen"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "Jeglichen Zugriff auf den Dirmngr verhindern"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passwörter"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Optionen zum Einstellen der Ausgabeformate"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr "Optionen zur Benutzung von Tor"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "Konfiguration für HTTP Server"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "Benutze die HTTP Proxy Einstellung des Systems"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "Konfiguration der zu nutzenden LDAP-Server"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "Liste der LDAP Server"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "Konfiguration zu OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr "Geheime Schlüssel"
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr "Smartcard"
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr "Netz"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr "Passwort Eingabe"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "Komponente unterstützt kein direktes starten"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Die Konfigurationsdatei der Komponente %s ist defekt\n"
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "Fehler beim Schließen von '%s'\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "Fehler beim Hashen von '%s'\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "Liste aller Komponenten"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "Prüfe alle Programme"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENTE|Zeige die Optionen an"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENTE|Ändere die Optionen"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENTE|Prüfe die Optionen"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "Wende die gobalen Voreinstellungen an"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr "|DATEI|Konfigurationsdateien mittels DATEI ändern"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "Hole die Einstellungsverzeichnisse von @GPGCONF@"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "Zeige die globale Konfigurationsdatei an"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "Prüfe die globale Konfigurationsdatei"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr "Abfrage der Datenbank mit Softwareversionen"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "\"reload\" an alle oder eine Komponente senden"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "Die angegebene Komponente starten"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "\"kill\" an eine Komponente senden"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "Aktiviere Änderungen zur Laufzeit; falls möglich"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Gebrauch: @GPGCONF@ [Optionen] (-h für Hilfe)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11160,15 +11194,15 @@ msgstr ""
 "Syntax: @GPGCONF@ {Optionen]\n"
 "Verwalte Konfigurationsoptionen für Programme des @GNUPG@ Systems\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Benötige ein Komponentenargument"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Komponente nicht gefunden"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "Argumente sind nicht erlaubt"
 
@@ -11184,6 +11218,36 @@ msgstr ""
 "Syntax: gpg-check-pattern [optionen] Musterdatei\n"
 "Das von stdin gelesene Passwort gegen die Musterdatei prüfen\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "Logausgaben in eine Datei umlenken"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
+
+#~ msgid "run without asking a user"
+#~ msgstr "Ausführung ohne Benutzernachfrage"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
+
+#~ msgid "import missing key from a signature"
+#~ msgstr "Schlüssel aus der Signatur importieren"
+
+#~ msgid "include the public key in signatures"
+#~ msgstr "Schlüssel mit in die Signatur packen"
+
+#~ 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 "requesting key %s from %s server %s\n"
 #~ msgstr "fordere Schlüssel %s von %s-Server %s an\n"
 
@@ -11355,9 +11419,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "%s kann nicht zum Schreiben geöffnet werden: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "Fehler beim Schreiben von %s: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "Fehler beim Lesen von %s: %s\n"
 
@@ -11539,9 +11600,6 @@ msgstr ""
 #~ msgid "listen() failed: %s\n"
 #~ msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
 
-#~ msgid "do not grab keyboard and mouse"
-#~ msgstr "Tastatur und Maus nicht \"grabben\""
-
 #~ msgid "Error: URL too long (limit is %d characters).\n"
 #~ msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
 
diff --git a/po/el.po b/po/el.po
index 358309e..d8b2a73 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -136,8 +136,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "κακή φ�άση κλειδί"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr ""
 
@@ -187,13 +187,47 @@ msgstr "κακό MPI"
 msgid "Bad Passphrase"
 msgstr "κακή φ�άση κλειδί"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "αλλαγή της φ�άσης κλειδί"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "δεν υποστη�ίζεται ο αλγό�ιθμος π�οστασίας %d%s\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -201,189 +235,172 @@ msgstr "δεν υποστη�ίζεται ο αλγό�ιθμος π�οστασ
 msgid "can't create '%s': %s\n"
 msgstr "αδυναμία δημιου�γίας του `%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "αδυναμία π�όσβασης στο `%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, fuzzy, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "αδυναμία εγγ�αφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "δε β�έθηκε εγγ�άψιμη μυστική κλειδοθήκη: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "αλλαγή της φ�άσης κλειδί"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: αδυναμία δημιου�γίας hashtable: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Επαναλάβετε τη φ�άση κλειδί: "
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Επαναλάβετε τη φ�άση κλειδί: "
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Επαναλάβετε τη φ�άση κλειδί: "
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "η φ�άση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "η φ�άση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "η φ�άση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "εγγ�αφή στο  `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "αδυναμία εγγ�αφής της κλειδοθήκης `%s': %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί\n"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Χ�ήση οπωσδήποτε αυτο� του κλειδιο�; "
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, 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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -391,7 +408,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Το όνομα π�έπει να έχει τουλάχιστον 5 χα�ακτή�ες\n"
 msgstr[1] "Το όνομα π�έπει να έχει τουλάχιστον 5 χα�ακτή�ες\n"
 
-#: agent/genkey.c:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -399,314 +416,391 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Χ�ειάζεστε μια Φ�άση κλειδί για να π�οστατε�σετε το μυστικό κλειδί.\n"
 "\n"
 
-#: agent/genkey.c:653
+#: agent/genkey.c:639
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-#, fuzzy
-msgid ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
 msgstr ""
-"@\n"
-"Επιλογές:\n"
-" "
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Το κλειδί έχει πα�ακαμθεί"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "αναλυτικά"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "ήσυχη έξοδος"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:192
-#, fuzzy
-msgid "use a log file for the server"
-msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "αναλυτικά"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "ήσυχη έξοδος"
+
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσ�νης"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:213
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|Ο�ΟΜΑ|καθο�ισμός του σετ χα�ακτή�ων τε�ματικο� σε Ο�ΟΜΑ"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "δεν υποστη�ίζεται"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "δεν υποστη�ίζεται"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
 #: agent/gpg-agent.c:244
-msgid "do not use the PIN cache when signing"
+msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:248
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:250
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:258
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:276
 #, fuzzy
-#| msgid "not supported"
-msgid "enable ssh support"
-msgstr "δεν υποστη�ίζεται"
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|χ�ήση της κατάστασης φ�άσης κλειδί N"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:278
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:283
 #, fuzzy
-#| msgid "not supported"
-msgid "enable putty support"
-msgstr "δεν υποστη�ίζεται"
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "χ�ήση του gpg-agent"
+
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Αναφέ�ετε τα π�οβλήματα στο <gnupg-bugs@gnu.org>\n"
 
-#: agent/gpg-agent.c:551
+#: agent/gpg-agent.c:572
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος πε�ίληψης δεν είναι έγκυ�ος\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "ανάγνωση επιλογών από `%s'\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "αδυναμία δημιου�γίας του %s: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδ�ία\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "αδυναμία δημιου�γίας καταλόγου `%s': %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: κατάλογος δημιου�γήθηκε\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read απέτυχε (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: αδυναμία δημιου�γίας καταλόγου: %s\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "η ενημέ�ωση μυστικο� απέτυχε: %s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: πα�αλείφθηκε: %s\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδ�ία\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Επιλογές:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -718,8 +812,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -727,9 +821,8 @@ msgstr ""
 "@Εντολές:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -783,43 +876,43 @@ msgstr "Ακ��ωση"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "τμήματα του μυστικο� κλειδιο� δεν είναι διαθέσιμα\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -832,19 +925,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ναι|ναί"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -857,7 +950,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -867,48 +960,48 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 #, fuzzy
 msgid "Change passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Σίγου�α θέλετε να διαγ�αφο�ν τα επιλεγμένα κλειδιά; "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 msgid "Delete key"
 msgstr "ενε�γοποιεί ένα κλειδί"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -939,7 +1032,7 @@ msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημ
 msgid "secret key parts are not available\n"
 msgstr "τμήματα του μυστικο� κλειδιο� δεν είναι διαθέσιμα\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -957,52 +1050,52 @@ msgstr "δεν υποστη�ίζεται ο αλγό�ιθμος π�οστασ
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "δεν υποστη�ίζεται ο αλγό�ιθμος π�οστασίας %d%s\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "αδυναμία εγγ�αφής μυστικής κλειδοθήκης `%s': %s\n"
@@ -1033,12 +1126,12 @@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία σÏ
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
@@ -1099,22 +1192,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "αδυναμία δημιου�γίας της κλειδοθήκης `%s': %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1454,7 +1547,7 @@ msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
@@ -1484,19 +1577,19 @@ msgstr ""
 msgid "invalid option \"%.50s\"\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "ΣΗΜΕΙΩΣΗ: μη π�οκαθο�ισμένο α�χείο επιλογών `%s'\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "α�χείο επιλογών `%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1516,41 +1609,41 @@ msgstr "αδυναμία π�όσβασης του α�χείου: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "αδυναμία δημιου�γίας καταλόγου `%s': %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "αδυναμία εγγ�αφής της κλειδοθήκης `%s': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "το δημόσιο κλειδί %08lX δεν β�έθηκε: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1790,23 +1883,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "θω�άκιση: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "το μυστικό κλειδί δεν είναι διαθέσιμο"
 
-#: g10/card-util.c:91 g10/card-util.c:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
@@ -1822,8 +1915,8 @@ msgstr "Αυτή η εντολή απαγοÏ�εÏ�ετε σε αυτή την κÎ
 msgid "Reset Code not or not anymore available\n"
 msgstr "τμήματα του μυστικο� κλειδιο� δεν είναι διαθέσιμα\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1833,230 +1926,230 @@ msgstr "Η επιλογή σας; "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 #, fuzzy
 msgid "not forced"
 msgstr "μη επεξε�γασμένο"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "κανένα αντίστιχο δημόσιο κλειδί: %s\n"
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "αδυναμία εγγ�αφής της κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 #, fuzzy
 msgid "Language preferences: "
 msgstr "αναωεωμένες επιλογές"
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "μη έγκυ�ος χα�ακτή�ας στο \"κο�δόνι\" της επιλογής\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "μη έγκυ�ος χα�ακτή�ας στο \"κο�δόνι\" της επιλογής\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Η δημιου�γία κλειδιο� απέτυχε: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "δε β�έθηκαν έγκυ�α OpenPGP δεδομένα.\n"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "αδυναμία εγγ�αφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Τι μέγεθος κλειδιο� θα θέλατε; (1024) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "στ�ογγυλοποιήθηκε έως τα %u bits\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Υπογ�αφή έληξε στις %s.\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Πα�ακαλώ επιλέξτε τον τ�πο του κλειδιο� που θέλετε:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (για υπογ�αφή μόνο)\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA και ElGamal (π�οκαθο�ισμένο)\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Μη έγκυ�η επιλογή.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 
-#: g10/card-util.c:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "αδυναμία εγγ�αφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "πα�αλείφθηκε: μυστικό κλειδί ήδη πα�ών\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2064,184 +2157,184 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Πα�ακαλώ επιλέξτε τον τ�πο του κλειδιο� που θέλετε:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Υπογ�αφή έληξε στις %s.\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Πα�ακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "πα�αλείφθηκε: μυστικό κλειδί ήδη πα�ών\n"
 
-#: g10/card-util.c:1928
+#: g10/card-util.c:1938
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Σίγου�α να υπογ�αφεί; "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "τε�ματισμός αυτο� του μενο�"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 #, fuzzy
 msgid "show admin commands"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "απεικόνιση αυτής της βοήθειας"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 #, fuzzy
 msgid "list all available data"
 msgstr "Κλειδί διαθέσιμο στο: "
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 #, fuzzy
 msgid "change the login name"
 msgstr "αλλαγή της ημε�ομηνίας λήξης"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 #, fuzzy
 msgid "change the language preferences"
 msgstr "αλλαγή της εμπιστοσ�νης ιδιοκτήτη"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 #, fuzzy
 msgid "generate new keys"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|Ο�ΟΜΑ|χ�ήση του Ο�ΟΜΑτος ως π�οκαθο�ισμένου πα�αλήπτη"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "αλλαγή της εμπιστοσ�νης ιδιοκτήτη"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Μη έγκυ�η εντολή  (δοκιμάστε \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output δεν λειτου�γεί για αυτή την εντολή\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "αδυναμία π�όσβασης του `%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2304,8 +2397,8 @@ msgid "subkey"
 msgstr "ΔημοσΚλειδί:"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
@@ -2346,26 +2439,26 @@ msgstr "αδυναμία χ�ήσης ενός συμμετ�ικο� πακέτ
 msgid "using cipher %s\n"
 msgstr "χ�ήση του κ�υπταλγό�ιθμου: %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' ήδη συμπιέστηκε\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: `%s' είναι ένα άδειο α�χείο\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του κ�υπταλγό�ιθμου \"%s\" στην κατάσταση %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2390,7 +2483,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2399,35 +2498,35 @@ msgstr ""
 "ο εξαναγκασμός χ�ήσης του αλγο�ίθμου συμπίεσης %s (%d) πα�αβιάζει τις\n"
 "επιλογές του πα�αλήπτη\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ο εξαναγκασμός συμμετ�ικο� αλγό�ιθμου %s (%d) πα�αβιάζει τις\n"
 "επιλογές του πα�αλήπτη\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s κ�υπτογ�αφήθηκε για: \"%s\"\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του %s στην κατάσταση %s.\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s κ�υπτογ�αφημένα δεδομένα\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "κ�υπτογ�αφημένο με άγνωστο αλγό�ιθμο %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2435,7 +2534,7 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το μήνυμα κ�υπτογ�αφήθηκε με αδ�ναμο κλειδί στο\n"
 "συμμετ�ικό κ�υπταλγό�ιθμο.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "π�όβλημα στο χει�ισμό κ�υπτογ�αφημένου πακέτου\n"
@@ -2635,235 +2734,286 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "χ�ήση του δευτε�ε�οντος κλειδιο� %08lX αντί του π�ωτε�οντος %08lX\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 #, fuzzy
 msgid "make a signature"
 msgstr "δημιου�γία μιας μη π�οσα�τημένης υπογ�αφής"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[α�χείο]|δημιου�γία μιας μη κ�υπτογ�αφημένης υπογ�αφής"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "δημιου�γία μιας μη π�οσα�τημένης υπογ�αφής"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "κ�υπτογ�άφηση δεδομένων"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "κ�υπτογ�άφηση με χ�ήση μόνο συμμετ�ικών αλγο�ίθμων"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "αποκ�υπτογ�άφηση δεδομένων (π�οκαθο�ισμένο)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "επαλήθευση μιας υπογ�αφής"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "απεικόνιση της λίστας κλειδιών"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "απεικόνιση της λίστας κλειδιών και υπογ�αφών"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "έλεγχος υπογ�αφής κλειδιο�"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "απεικόνιση της λίστας κλειδιών και αποτυπωμάτων (fingerprints)"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "αφαί�εση των κλειδιών από τη δημόσια κλειδοθήκη"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "αφαί�εση των κλειδιών από τη μυστική κλειδοθήκη"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "υπογ�αφή ενός κλειδιο�"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "υπογ�αφή ενός κλειδιο� τοπικά"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "υπογ�αφή ενός κλειδιο�"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "υπογ�αφή ενός κλειδιο� τοπικά"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "υπογ�αφή ή επεξε�γασία ενός κλειδιο�"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 #, fuzzy
 msgid "change a passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "εξαγωγή κλειδιών"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "εξαγωγή κλειδιών σε ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "ανανέωση όλων των κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "εισαγωγή/συγχώνευση κλειδιών"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσ�νης"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 #, fuzzy
 msgid "print message digests"
 msgstr "|αλγό� [α�χεία]| απεικόνιση πε�ιλήψεων των μηνυμάτων"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
-msgid "create ascii armored output"
-msgstr "δημιου�γία ascii θω�ακισμένης εξόδου"
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|Ο�ΟΜΑ|χ�ήση Ο�ΟΜΑτος σαν π�οκαθο�ισμένο μυστικό κλειδί"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
+#: g10/gpg.c:596 sm/gpgsm.c:332
 #, fuzzy
-msgid "|USER-ID|encrypt for USER-ID"
+msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|Ο�ΟΜΑ|κ�υπτογ�άφηση για Ο�ΟΜΑ"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "να μη γίνει καμμία αλλαγή"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "ε�ώτηση π�ιν την επικάλυψη"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr ""
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr ""
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
+msgid "create ascii armored output"
+msgstr "δημιου�γία ascii θω�ακισμένης εξόδου"
+
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
 #, fuzzy
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "χ�ήση αυτής της ταυτότητας (user id) για υπογ�αφή ή αποκ�υπτογ�άφηση"
+msgid "|FILE|write output to FILE"
+msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "χ�ήση κανονικής κατάστασης κειμένου"
+
+#: g10/gpg.c:743
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|καθο�ισμός επιπέδου συμπίεσης N (0 απενε�γοποιεί)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "χ�ήση κανονικής κατάστασης κειμένου"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr ""
+
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr ""
+
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr ""
+
+#: g10/gpg.c:803 sm/gpgsm.c:324
 #, fuzzy
-msgid "|FILE|write output to FILE"
-msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "να μη γίνει καμμία αλλαγή"
+#: g10/gpg.c:805 sm/gpgsm.c:326
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|Ο�ΟΜΑ|κ�υπτογ�άφηση για Ο�ΟΜΑ"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "ε�ώτηση π�ιν την επικάλυψη"
+#: g10/gpg.c:813 sm/gpgsm.c:328
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "χ�ήση αυτής της ταυτότητας (user id) για υπογ�αφή ή αποκ�υπτογ�άφηση"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2871,7 +3021,7 @@ msgstr ""
 "@\n"
 "(δείτε τη σελίδα man για μια πλή�η λίστα εντολών και επιλογών)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2901,13 +3051,13 @@ msgstr ""
 " --list-keys [ονόματα]        απεικόνιση κλειδιών\n"
 " --fingerprint [ονόματα]      απεικόνιση αποτυπωμάτων (fingerprints)\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2922,7 +3072,7 @@ msgstr ""
 "υπογ�αφή, έλεγχος, κ�υπτογ�άφηση ή αποκ�υπτογ�άφηση\n"
 "η π�οκαθο�ισμένη λειτου�γία εξα�τάται από τα δεδομένα εισόδου\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2930,558 +3080,558 @@ msgstr ""
 "\n"
 "Υποστη�ιζόμενοι αλγό�ιθμοι:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "ΔημοσΚλειδί:"
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Κ�υπταλγό�ιθμος: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Συμπίεση: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "χ�ήση: gpg [επιλογές] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "δεν β�έθηκε το σ�μβολο = στον ο�ισμό της ομάδας \"%s\"\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1677
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1660
+#: g10/gpg.c:1686
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1689
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "άγνωστο αντικείμενο �υθμίσεως \"%s\"\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Δεν β�έθηκε αντίστοιχη υπογ�αφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Δεν β�έθηκε αντίστοιχη υπογ�αφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "απεικόνιση της κλειδοθήκης στην οποία αναφέ�ετε το κλειδί"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Δεν β�έθηκε αντίστοιχη υπογ�αφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "άγνωστος π�οκαθο�ισμένος πα�αλήπτης `%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Αυτή η εντολή απαγο�ε�ετε σε αυτή την κατάσταση %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Μη έγκυ�η διε�θυνση Email\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "μη έγκυ�ος αλγό�ιθμος  hash `%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "αδυναμία ο�ισμο� του exec-path σε %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το π�όγ�αμμα ίσως δημιου�γήσει α�χείο core!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s πα�ακάμπτει το %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "το %s δεν επιτ�έπεται με το %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "το %s δεν έχει καμμία έννοια μαζί με το %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος κ�υπτογ�άφησης δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος κ�υπτογ�άφησης δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "ο επιλεγμένος αλγό�ιθμος πε�ίληψης για πιστοποίηση\n"
 "δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed π�έπει να είναι μεγαλ�τε�α από 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed π�έπει να είναι μεγαλ�τε�α από 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "μη έγκυ�ο min-cert-level· π�έπει να είναι 0, 1, 2, ή 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ΣΗΜΕΙΩΣΗ: η απλή S2K κατάσταση (0) π�έπει να αποφε�γεται\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "μη έγκυ�η κατάσταση S2K; π�έπει να είναι 0, 1 ή 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� κ�υπταλγό�ιθμου\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� αλγό�ιθμου πε�ίληψης\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� αλγό�ιθμου συμπίεσης\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "το %s ακόμα δε λειτου�γεί μαζί με το %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "απαγο�ε�ετε η χ�ήση του αλγό�ιθμου συμπίεσης \"%s\" στην κατάσταση %s\n"
 
-#: g10/gpg.c:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δώθηκαν πα�αλήπτες (-r) χώ�ις χ�ήση κ�υπτογ�άφησης\n"
 "δημοσίου κλειδιο�\n"
 
-#: g10/gpg.c:4199
+#: g10/gpg.c:4197
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "αποκ�υπτογ�άφηση απέτυχε: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του %s στην κατάσταση %s.\n"
 
-#: g10/gpg.c:4289
+#: g10/gpg.c:4287
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4292
+#: g10/gpg.c:4290
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του %s στην κατάσταση %s.\n"
 
-#: g10/gpg.c:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver αποστολή απέτυχε: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver λήψη απέτυχε: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "εξαγωγή κλειδιο� απέτυχε: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "εξαγωγή κλειδιο� απέτυχε: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver αναζήτηση απέτυχε: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver ανανέωση απέτυχε: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "αποθω�άκιση απέτυχε: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "μη έγκυ�ος αλγό�ιθμος  hash `%s'\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Μπο�είτε τώ�α να εισαγάγετε το μήνυμα σας ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "το URL πολιτικής πιστοποιητικο� που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
@@ -3495,7 +3645,7 @@ msgstr "εξαγωγή των κλειδιών από αυτή τη κλειδο
 msgid "make timestamp conflicts only a warning"
 msgstr "ο�ισμός των συγκ�ο�σεων ώ�ας (timestamp) μόνο σαν π�οειδοποίηση"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|εγγ�αφή των πλη�οφο�ιών κατάστασης στο FD"
 
@@ -4209,7 +4359,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Σίγου�α θέλετε ακόμα να το υπογ�άψετε; (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Αδυναμία υπογ�αφής.\n"
 
@@ -4412,8 +4562,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Σίγου�α να υπογ�αφεί; "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "η υπογ�αφή απέτυχε: %s\n"
@@ -4626,7 +4776,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Το κλειδί ανακλήθηκε."
 
@@ -4679,7 +4829,7 @@ msgstr "Σίγου�α θέλετε να διαγ�αφεί αυτό το user I
 msgid "Really move the primary key? (y/N) "
 msgstr "Σίγου�α θέλετε να διαγ�αφεί αυτό το user ID; "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Π�έπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
@@ -4767,169 +4917,169 @@ msgstr "Αποθήκευση των αλλαγών; "
 msgid "Quit without saving? (y/N) "
 msgstr "Τε�ματισμός χω�ίς αποθήκευση; "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Το κλειδί δεν άλλαξε οπότε δεν χ�ειάζεται ενημέ�ωση.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "μη έγκυ�η τιμή\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Δεν υπά�χει αυτό το user ID.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Τίποτα για να υπογ�αφεί με το κλειδί  %08lX\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   υπογ�άφθηκε από %08lX στις %s%s\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Πε�ίληψη: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Δυνατότητε: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 #, fuzzy
 msgid "Notations: "
 msgstr "Σημείωση: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Δεν υπά�χουν π�οεπιλογές σε ένα user ID τ�που PGP 2.x.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Αυτό το κλειδί μπο�εί να ανακληθεί από %s κλειδί "
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Αυτό το κλειδί μπο�εί να ανακληθεί από %s κλειδί "
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (ευαίσθητο)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "αδυναμία δημιου�γίας του %s: %s\n"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[ανακλημένο]"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [λήγει: %s]"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [λήγει: %s]"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " εμπιστοσ�νη: %c/%c"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " εμπιστοσ�νη: %c/%c"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Αυτό το κλειδί έχει απενε�γοποιηθεί"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4937,19 +5087,19 @@ msgstr ""
 "Η εγγυ�ότητα του απεικονιζόμενου κλειδιο� δεν είναι απα�αίτητα σωστή\n"
 "εκτός και εάν επανακκινήσετε το π�όγ�αμμα.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "revoked"
 msgstr "[ανακλημένο]"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4958,18 +5108,18 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει σημειωθεί ID χ�ήστη σαν π�ωτε�ων.  Αυτή η εντολή\n"
 "              μπο�εί να κάνει ένα άλλο ID χ�ήστη να γίνει το π�ωτε�ων.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Δεν μπο�είτε να αλλάξετε την ημε�ομηνία λήξης σε ένα v3 κλειδί\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4978,35 +5128,35 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό έιναι ένα κλειδί τ�που PGP2. Η π�οσθήκη ενός photo ID\n"
 "               μπο�εί να κάνει με�ικές εκδόσεις PGP να το απο��ίψουν.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Σίγου�α ακόμα θέλετε να το π�οσθέσετε; (y/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Δεν μπο�είτε να π�οσθέσετε μια photo ID σε ένα κλειδί τ�που PGP2.\n"
 
-#: g10/keyedit.c:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Διαγ�αφή αυτής της καλής υπογ�αφής; (y/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Διαγ�αφή αυτής της μη έγκυ�ης υπογ�αφής; (y/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Διαγ�αφή αυτής της άγνωστης υπογ�αφής; (y/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Σίγου�α να διαγ�αφεί αυτή η ιδιο-υπογ�αφή; (y/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5014,38 +5164,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Διαγ�άφτηκε %d υπογ�αφή.\n"
 msgstr[1] "Διαγ�άφτηκε %d υπογ�αφή.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Τίποτα δεν διαγ�άφτηκε.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "invalid"
 msgstr "μη έγκυ�η θω�άκιση"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Το user ID \"%s\" ανακαλείτε."
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Το user ID \"%s\" ανακαλείτε."
 msgstr[1] "Το user ID \"%s\" ανακαλείτε."
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5055,40 +5205,40 @@ msgstr ""
 "               καθο�ισμένου ανακλητή μπο�εί να κάνει με�ικές εκδόσεις PGP\n"
 "               να το απο��ίψουν.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Δεν μπο�είτε να π�οσθέσετε ένα καθο�ισμένο ανακλητή σε κλειδί τ�που PGP2.x.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Πληκτ�ολογήστε το user ID του διο�ισμένου ανακλητή: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "αδυναμία ο�ισμο� ενός κλειδιο� τ�που PGP 2.x, σαν διο�ισμένου ανακλητή\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "δε μπο�είτε να ο�ίσετε ένα κλειδί σαν το διο�ισμένο ανακλητή του εαυτο� του\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί έχει ανακληθεί από τον ο�ισμένο ανακλητή!\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εάν ο�ίσετε ένα κλειδί σαν διο�ισμένο ανακλητή δεν μπο�εί να "
 "επανέλθει!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5096,7 +5246,7 @@ msgstr ""
 "Είστε σίγου�οι ότι θέλετε να ο�ίσετε ένα κλειδί σαν διο�ισμένο ανακλητή; (y/"
 "N): "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5105,184 +5255,184 @@ msgstr ""
 "Είστε σίγου�οι ότι θέλετε να ο�ίσετε ένα κλειδί σαν διο�ισμένο ανακλητή; (y/"
 "N): "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Αλλαγή ημε�ομηνίας λήξης για ένα δευτε�ε�ον κλειδί.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Αλλαγή ημε�ομηνίας λήξης για ένα π�ωτε�ον κλειδί.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Δεν μπο�είτε να αλλάξετε την ημε�ομηνία λήξης σε ένα v3 κλειδί\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Αλλαγή ημε�ομηνίας λήξης για ένα δευτε�ε�ον κλειδί.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Αλλαγή ημε�ομηνίας λήξης για ένα π�ωτε�ον κλειδί.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογ�άφων υποκλειδί %08lX δεν έχει κατ' αντιπα�άσταση "
 "πιστοποιηθεί\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Π�έπει να επιλέξετε ακ�ιβώς ένα user ID.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "πα�αλείφθηκε η v3 ιδιο-υπογ�αφή στο user id \"%s\"\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Σίγου�α θέλετε ακόμα να το χ�ησιμοποιήσετε; (y/N) "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Σίγου�α θέλετε ακόμα να το χ�ησιμοποιήσετε; (y/N) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Σημείωση υπογ�αφής: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Επικάλυψη (y/N); "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   υπογ�άφθηκε από %08lX στις %s%s%s\n"
 
-#: g10/keyedit.c:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (μη-εξαγώγιμο)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Αυτή η υπογ�αφή έληξε στις %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Σίγου�α θέλετε να ανακληθεί αυτό το κλειδί; "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Δημιου�γία ενός πιστοποιητικο� ανάκλησης για αυτή την υπογ�αφή; (y/N)"
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Έχετε υπογ�άψει αυτά τα user ID:\n"
 
-#: g10/keyedit.c:6055
+#: g10/keyedit.c:6111
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (μη-εξαγώγιμο)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ανακλήθηκε από %08lX στις %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Σκοπε�ετε να ανακαλέσετε αυτές τις υπογ�αφές:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Σίγου�α να δημιου�γηθο�ν τα πιστοποιητικά ανάκλησης; (y/N)"
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "κανένα μυστικό κλειδί\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μια υπογ�αφή user ID έχει ημε�ομηνία %d δε�τε�α στο μέλλον\n"
 
-#: g10/keyedit.c:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5755,7 +5905,7 @@ msgstr ""
 "στη γεννήτ�ια τυχαίων α�ιθμών μια ευκαι�ία να μαζέψει α�κετή εντ�οπία.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Η δημιου�γία κλειδιο� απέτυχε: %s\n"
@@ -5824,11 +5974,11 @@ msgstr "δε β�έθηκε εγγ�άψιμη δημόσια κλειδοθήκ
 msgid "error writing public keyring '%s': %s\n"
 msgstr "αδυναμία εγγ�αφής δημόσιας κλειδοθήκης `%s': %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "το δημόσιο και το μυστικό κλειδί δημιου�γήθηκαν και υπογ�άφηκαν.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5839,7 +5989,7 @@ msgstr ""
 "Μπο�είτε να χ�ησιμοποιήσετε την εντολή \"--edit-key\" για να δημιου�γηθεί\n"
 "ένα δευτε�ε�ον κλειδί για αυτό το λόγο.\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5847,7 +5997,7 @@ msgstr ""
 "το κλειδί δημιου�γήθηκε %lu δευτε�όλεπτο στο μέλλον (χ�ονοδίνη ή\n"
 "απλώς π�όβλημα στο �ολόι)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5855,7 +6005,7 @@ msgstr ""
 "το κλειδί δημιου�γήθηκε %lu δευτε�όλεπτα στο μέλλον (χ�ονοδίνη ή\n"
 "απλώς π�όβλημα στο �ολόι)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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"
@@ -5863,17 +6013,17 @@ msgstr ""
 "ΣΗΜΕΙΩΣΗ: η δημιου�γία υποκλειδιών για κλειδιά v3 δεν είναι σ�μφωνο\n"
 "με το OpenPGP\n"
 
-#: g10/keygen.c:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Μυστικά τμήματα του κ��ιου κλειδιο� δεν είναι διαθέσιμα.\n"
 
-#: g10/keygen.c:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Μυστικά τμήματα του κ��ιου κλειδιο� δεν είναι διαθέσιμα.\n"
 
-#: g10/keygen.c:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Σίγου�α να δημιου�γηθεί; "
@@ -6090,202 +6240,202 @@ msgstr "αίτηση κλειδιο� %08lX από το %s\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγ�αφής tempfile (%s) `%s': %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "πα�άξενο μέγεθος για ένα κλειδί κ�υπτογ�αφημένης συνεδ�ίας (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s κλειδί κ�υπτογ�αφημένης συνεδ�ία\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "κ�υπτογ�αφημένο με άγνωστο αλγό�ιθμο %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "δημόσιο κλειδί είναι %08lX\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "κ�υπτογ�αφημένα δεδομένα με δημόσιο κλειδί: καλό DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "κ�υπτογ�αφημένο με %u-bit %s κλειδί, ID %08lX, δημιου�γήθηκε %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "κ�υπτογ�αφημένο με %s key, ID %08lX\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "κ�υπτογ�άφηση με δημόσιο κλειδί απέτυχε: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "κ�υπτογ�αφημένο με %lu φ�άσεις κλειδιά\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "κ�υπτογ�αφημένο με 1 φ�άση κλειδί\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "υπόθεση %s κ�υπτογ�αφημένων δεδομένων\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "Κ�υπταλγό�ιθμος IDEA μη διαθέσιμος, αισιόδοξη π�οσπάθεια χ�ήσης του\n"
 "%s αντίθετα\n"
 
-#: g10/mainproc.c:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν π�οστατε�τηκε η ακε�αιότητα του μη�ματος\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "αποκ�υπτογ�άφηση απέτυχε: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "αποκ�υπτογ�άφηση OK\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το κ�υπτογ�αφημένο μήνυμα έχει πει�αχθεί!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "αποκ�υπτογ�άφηση απέτυχε: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "α�χικό όνομα α�χείου='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "ανεξά�τητη ανάκληση - χ�ησιμοποιείστε \"gpg --import\" για εφα�μογή\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Καλή υπογ�αφή από \""
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ΚΑΚΗ υπογ�αφή από \""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Ληγμένη υπογ�αφή από \""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Καλή υπογ�αφή από \""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "καταστολή ανάκλησης υπογ�αφής\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "αδυναμία χει�ισμο� αυτών των πολλαπλών υπογ�αφών\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Υπογ�αφή έληξε στις %s.\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Υπογ�αφή έγινε στο %.*s με χ�ήση του κλειδιο�%s ID %08lX\n"
 
-#: g10/mainproc.c:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Κλειδί διαθέσιμο στο: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[αβέβαιο]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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"
@@ -6293,68 +6443,68 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί δεν έχει πιστοποιηθεί με εμπιστε�σιμη "
 "υπογ�αφή!\n"
 
-#: g10/mainproc.c:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Υπογ�αφή έληξε στις %s.\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Υπογ�αφή λήγει στις %s.\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "δυαδικό"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "κατάσταση-κειμένου"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "άγνωστος αλγό�ιθμος δημοσίου κλειδιο�"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Αδυναμία ελέγχου της υπογ�αφής: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "δεν είναι αποκομμένη υπογ�αφή\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εντοπισμός πολλαπλών υπογ�αφών. Μόνο η π�ώτη θα ελεγχθεί.\n"
 
-#: g10/mainproc.c:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "ανεξά�τητη υπογ�αφή κλάσης 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "υπογ�αφή παλιο� στυλ (PGP 2.x)\n"
@@ -6425,68 +6575,68 @@ msgstr "σφάλμα ανάγνωσης: %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: μη συνειστώμενη επιλογή \"%s\"\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "πα�ακαλώ χ�ησιμοποιήστε το \"%s%s\" καλ�τε�α\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Ασυμπίεστο"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Ασυμπίεστο"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "αυτό το μήνυμα ίσως δεν μπο�εί να χ�ησιμοποιηθεί από %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "ανάγνωση επιλογών από `%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "άγνωστος π�οκαθο�ισμένος πα�αλήπτης `%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "άγνωστη κλάση υπογ�αφής"
@@ -6522,23 +6672,23 @@ msgstr "εγγ�αφή στην stdout\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "υπόθεση υπογεγ�αμμένων δεδομένων στο `%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "αδυναμία χει�ισμο� του αλγό�ιθμου δημοσίου κλειδιο� %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: πιθανόν μη ασφαλές κ�υπτογ�αφημένο συμμετ�ικά κλειδί\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Σημείωση κ�ίσιμης υπογ�αφής: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "υποπακέτο τ�που %d έχει ο�ισμένο το κ�ιτικό bit\n"
@@ -6968,12 +7118,12 @@ msgstr "άγνωστος π�οκαθο�ισμένος πα�αλήπτης `%s
 msgid "no valid addressees\n"
 msgstr "καμμία έγκυ�η διε�θυνση\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "κλειδί %08lX: δεν υπά�χει αυτό το user ID\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "κλειδί %08lX: δεν υπά�χει αυτό το user ID\n"
@@ -7417,7 +7567,7 @@ msgstr ""
 "πα�αλείφθηκε `%s': αυτό είναι δημιου�γημένο από PGP κλειδί ElGamal και δεν "
 "είναι ασφαλές για υπογ�αφές!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "εγγ�αφή trust %lu, τ�πος %d: write απέτυχε: %s\n"
@@ -7465,7 +7615,7 @@ msgstr "σφάλμα στην εÏ�Ï�εση της εγγÏ�αφής εμπιστÎ
 msgid "read error in '%s': %s\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync απέτυχε: %s\n"
@@ -7974,101 +8124,101 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' δεν είναι έγκυ�ο μακ�� keyID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "κλειδί %08lX: αποδοχή σαν κλειδί με εμπιστοσ�νη\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "το κλειδί %08lX υπά�χει πάνω από μια φο�ά στην trustdb\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "κλειδί %08lX: κανένα δημόσιο κλειδί για το κλειδί με εμπιστοσ�νη - "
 "πα�άλειψη\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "σημείωση κλειδιο� σαν απόλυτης εμπιστοσ�νης.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "εγγ�αφή trust %lu, req τ�πος %d: read απέτυχε: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "η εγγ�αφή trust %lu δεν είναι του ζητο�μενου τ�που %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "δεν υπά�χει ανάγκη για έλεγχο της trustdb\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "επόμενος έλεγχος της trustdb θα γίνει στις %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "δεν υπά�χει ανάγκη για έλεγχο της trustdb\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "δεν υπά�χει ανάγκη για έλεγχο της trustdb\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "το δημόσιο κλειδί %08lX δεν β�έθηκε: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "πα�ακαλώ κάντε ένα --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "έλεγχος της trustdb\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu κλειδιά έχουν μέχ�ι τώ�α επεξε�γαστεί\n"
 msgstr[1] "%lu κλειδιά έχουν μέχ�ι τώ�α επεξε�γαστεί\n"
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8076,46 +8226,46 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d κλειδιά επεξε�γάστηκαν (%d μετ�ήσεις εγγυ�ότητας πέ�ασαν)\n"
 msgstr[1] "%d κλειδιά επεξε�γάστηκαν (%d μετ�ήσεις εγγυ�ότητας πέ�ασαν)\n"
 
-#: g10/trustdb.c:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "δε β�έθηκαν απόλυτα εμπιστε�σιμα κλειδιά\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "δε β�έθηκε το δημόσιο κλειδί του απόλυτα εμπιστε�σιμου κλειδιο� %08lX\n"
 
-#: g10/trustdb.c:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 ""
 
@@ -8127,43 +8277,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 ""
 
@@ -8211,35 +8361,35 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Πα�ακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-p15.c:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "αλλαγή της φ�άσης κλειδί"
@@ -8307,7 +8457,7 @@ msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
@@ -8372,7 +8522,7 @@ msgstr ""
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver αποστολή απέτυχε: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
@@ -8518,13 +8668,13 @@ msgstr "%s υπογ�αφή, αλγό�ιθμος πε�ίληψης %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "δε β�έθηκαν έγκυ�α OpenPGP δεδομένα.\n"
@@ -8541,81 +8691,87 @@ msgstr "αλλαγή της φ�άσης κλειδί"
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|Ο�ΟΜΑ|χ�ήση του Ο�ΟΜΑτος ως π�οκαθο�ισμένου πα�αλήπτη"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|Ο�ΟΜΑ|χ�ήση του Ο�ΟΜΑτος ως π�οκαθο�ισμένου πα�αλήπτη"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "μη χ�ήση τε�ματικο�"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:179
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
-msgstr ""
-
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "αδυναμία εγγ�αφής μυστικής κλειδοθήκης `%s': %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8674,7 +8830,7 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8840,7 +8996,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -8894,7 +9050,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -8905,7 +9061,7 @@ msgstr "μη επεξε�γασμένο"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 #, fuzzy
 msgid "none"
 msgstr "όχι|οχι"
@@ -8942,42 +9098,37 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s κλειδί, ID %08lX, δημιου�γία %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, fuzzy, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "αδυναμία εγγ�αφής μυστικής κλειδοθήκης `%s': %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
@@ -9171,6 +9322,11 @@ msgstr "ΔημιουÏ�γία ενός πιστοποιητικοÏ� ανάκληÏ
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9249,134 +9405,134 @@ msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Δεν δώθηκε πε�ιγ�αφή)\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 #, fuzzy
 msgid "list external keys"
 msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 #, fuzzy
 msgid "list certificate chain"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "import certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 #, fuzzy
 msgid "export certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:258
-#, fuzzy
-msgid "create base-64 encoded output"
-msgstr "δημιου�γία ascii θω�ακισμένης εξόδου"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "μη χ�ήση τε�ματικο�"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:278
-msgid "never consult a CRL"
-msgstr ""
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "δημιου�γία ascii θω�ακισμένης εξόδου"
 
-#: sm/gpgsm.c:288
-msgid "check validity using OCSP"
-msgstr ""
+#: sm/gpgsm.c:330
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|Ο�ΟΜΑ|χ�ήση Ο�ΟΜΑτος σαν π�οκαθο�ισμένο μυστικό κλειδί"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr ""
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "π�οσθήκη αυτο� του κλειδιο� στη λίστα των κλειδοθηκών"
 
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:299
-msgid "do not check certificate policies"
+#: sm/gpgsm.c:354
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|Ο�ΟΜΑ|χ�ήση αλγό�ιθμου κ�υπτογ�άφησης Ο�ΟΜΑ για φ�άσεις κλειδιά"
+
+#: sm/gpgsm.c:372
+msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "μη χ�ήση τε�ματικο�"
+#: sm/gpgsm.c:380
+msgid "check validity using OCSP"
+msgstr ""
 
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:382
+msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
-#, fuzzy
-msgid "|FILE|write an audit log to FILE"
-msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|Ο�ΟΜΑ|χ�ήση αλγό�ιθμου κ�υπτογ�άφησης Ο�ΟΜΑ"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|Ο�ΟΜΑ|χ�ήση αλγό�ιθμου πε�ίληψης μην�ματος Ο�ΟΜΑ "
+
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "κατάσταση batch: να μη γίνονται ε�ωτήσεις"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "απάντηση ναι στις πε�ισσότε�ες ε�ωτήσεις"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "απάντηση όχι στις πε�ισσότε�ες ε�ωτήσεις"
 
-#: sm/gpgsm.c:329
+#: sm/gpgsm.c:418
 #, fuzzy
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "π�οσθήκη αυτο� του κλειδιο� στη λίστα των κλειδοθηκών"
-
-#: sm/gpgsm.c:332
-#, fuzzy
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|Ο�ΟΜΑ|χ�ήση Ο�ΟΜΑτος σαν π�οκαθο�ισμένο μυστικό κλειδί"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-#, fuzzy
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|ΔΙΑΚΟΜΙΣΤΗΣ|χ�ήση αυτο� του διακομιστή κλειδιών για αναζήτηση"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|Ο�ΟΜΑ|χ�ήση αλγό�ιθμου κ�υπτογ�άφησης Ο�ΟΜΑ"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|Ο�ΟΜΑ|χ�ήση αλγό�ιθμου πε�ίληψης μην�ματος Ο�ΟΜΑ "
+msgid "|FILE|write an audit log to FILE"
+msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9387,27 +9543,27 @@ msgstr ""
 "υπογ�αφή, έλεγχος, κ�υπτογ�άφηση ή αποκ�υπτογ�άφηση\n"
 "η π�οκαθο�ισμένη λειτου�γία εξα�τάται από τα δεδομένα εισόδου\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "αδυναμία σ�νδεσης στο `%s': %s\n"
 
-#: sm/gpgsm.c:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "άγνωστος π�οκαθο�ισμένος πα�αλήπτης `%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "εγγ�αφή στο  `%s'\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "αδυναμία κλεισίματος του `%s': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9467,7 +9623,7 @@ msgstr "rev? π�όβλημα στον έλεγχο ανάκλησης: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr ""
 
@@ -9497,7 +9653,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9542,23 +9698,23 @@ msgstr ""
 msgid "algorithm:"
 msgstr "θω�άκιση: %s\n"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Καλή υπογ�αφή από \""
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "                γνωστό σαν \""
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -10359,116 +10515,140 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-msgid "run without asking a user"
-msgstr "Τε�ματισμός χω�ίς αποθήκευση; "
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:242
+#, fuzzy
+msgid "|URL|use keyserver at URL"
+msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|ΔΙΑΚΟΜΙΣΤΗΣ|χ�ήση αυτο� του διακομιστή κλειδιών για αναζήτηση"
+
+#: dirmngr/dirmngr.c:271
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:227
-#, fuzzy
-msgid "|URL|use OCSP responder at URL"
-msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr ""
 
-#: dirmngr/dirmngr.c:229
-msgid "|FPR|OCSP response signed by FPR"
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+#: dirmngr/dirmngr.c:285
+#, fuzzy
+msgid "|URL|use OCSP responder at URL"
+msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
+
+#: dirmngr/dirmngr.c:287
+msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10481,95 +10661,95 @@ msgstr ""
 "@\n"
 "(δείτε τη σελίδα man για μια πλή�η λίστα εντολών και επιλογών)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "χ�ήση: gpg [επιλογές] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "η γ�αμμή είναι πολ� μεγάλη\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "μη επεξε�γασμένο"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -10762,93 +10942,93 @@ msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημ
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 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:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "χ�ήση του κ�υπταλγό�ιθμου: %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10858,68 +11038,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "η υπογ�αφή απέτυχε: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "η υπογ�αφή απέτυχε: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "αδυναμία δημιου�γίας του `%s': %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: αδυναμία δημιου�γίας hashtable: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#: dirmngr/server.c:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10965,7 +11145,7 @@ msgstr "η π�οεπιλογή %c%lu αντιγ�άφτηκε\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 #, fuzzy
 msgid "quiet"
 msgstr "τε�ματισμός"
@@ -11059,308 +11239,157 @@ msgstr "η υπογ�αφή απέτυχε: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr ""
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr ""
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr ""
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-
-#: tools/gpgconf-comp.c:588
-#, fuzzy
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|χ�ήση της κατάστασης φ�άσης κλειδί N"
-
-#: tools/gpgconf-comp.c:592
-#, fuzzy
-msgid "do not allow the reuse of old passphrases"
-msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|Ο�ΟΜΑ|χ�ήση Ο�ΟΜΑτος σαν π�οκαθο�ισμένο μυστικό κλειδί"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-#, fuzzy
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|Ο�ΟΜΑ|κ�υπτογ�άφηση για Ο�ΟΜΑ"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-#, fuzzy
-msgid "|URL|use keyserver at URL"
-msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-msgid "include the public key in signatures"
-msgstr "έλεγχος υπογ�αφής κλειδιο�"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr ""
-
-#: tools/gpgconf-comp.c:838
-#, fuzzy
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|Ο�ΟΜΑ|χ�ήση αλγό�ιθμου κ�υπτογ�άφησης Ο�ΟΜΑ για φ�άσεις κλειδιά"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr ""
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr ""
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "σφάλμα δικτ�ου"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "κακή φ�άση κλειδί"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "δεν β�έθηκε το δημόσιο κλειδί"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "list global configuration file"
 msgstr "άγνωστο αντικείμενο �υθμίσεως \"%s\"\n"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 #, fuzzy
 msgid "check global configuration file"
 msgstr "άγνωστο αντικείμενο �υθμίσεως \"%s\"\n"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσ�νης"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "χ�ήση ως α�χείου εξόδου"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 #, fuzzy
 msgid "Component not found"
 msgstr "δεν β�έθηκε το δημόσιο κλειδί"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 #, fuzzy
 msgid "No argument allowed"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
@@ -11377,6 +11406,27 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "εγγ�αφή στο  `%s'\n"
+
+#, fuzzy
+#~ msgid "use a log file for the server"
+#~ msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
+
+#, fuzzy
+#~ msgid "run without asking a user"
+#~ msgstr "Τε�ματισμός χω�ίς αποθήκευση; "
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
+
+#, fuzzy
+#~ msgid "include the public key in signatures"
+#~ msgstr "έλεγχος υπογ�αφής κλειδιο�"
+
+#, fuzzy
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "αίτηση κλειδιο� %08lX από το %s\n"
 
@@ -11516,10 +11566,6 @@ msgstr ""
 #~ msgstr "αδυναμία π�όσβασης του %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "αδυναμία εγγ�αφής της κλειδοθήκης `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
@@ -13271,9 +13317,6 @@ msgstr ""
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "ποτέ χ�ήση MDC για κ�υπτογ�άφηση"
 
-#~ msgid "use the gpg-agent"
-#~ msgstr "χ�ήση του gpg-agent"
-
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[α�χείο]|εγγ�αφή των πλη�οφο�ιών κατάστασης στο α�χείο"
 
diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo
index cd076e2..047c657 100644
--- a/po/en@boldquot.gmo
+++ b/po/en@boldquot.gmo
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index d88502e..d0b67fc 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -1,7 +1,7 @@
 # English translations for GNU gnupg package.
-# Copyright (C) 2021 Free Software Foundation, Inc.
+# Copyright (C) 2022 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNU gnupg package.
-# Automatically generated, 2021.
+# Automatically generated, 2022.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.2.33\n"
+"Project-Id-Version: GNU gnupg 2.2.37\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-11-23 10:54+0100\n"
-"PO-Revision-Date: 2021-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+0200\n"
+"PO-Revision-Date: 2022-08-24 15:33+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -158,8 +158,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "does not match - try again"
 
@@ -204,62 +204,92 @@ msgstr "Bad PIN"
 msgid "Bad Passphrase"
 msgstr "Bad Passphrase"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr "Note: Request from the web browser."
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr "Note: Request from a remote site."
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "error getting serial number of card: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
+#: agent/command.c:2423
+#, c-format
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh keys greater than %d bits are not supported\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "can't create '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "can't open '%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "error getting serial number of card: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "detected card with S/N: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "no authentication key for ssh on card: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "no suitable card key found: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error getting list of cards: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -268,24 +298,20 @@ msgstr ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "Allow"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "Deny"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Please re-enter this passphrase"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -294,96 +320,91 @@ msgstr ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "failed to create stream from socket: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "Please insert the card with serial number"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "Please remove the current card and insert the one with serial number"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "Admin PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Reset Code"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr "Push ACK button on card/token."
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr "Use the reader's pinpad for input."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Repeat this Reset Code"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "Repeat this PUK"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Repeat this PIN"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Reset Code not correctly repeated; try again"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK not correctly repeated; try again"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN not correctly repeated; try again"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Please enter the PIN%s%s%s to unlock the card"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "error creating temporary file: %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "error writing to temporary file: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "error writing to pipe: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Enter new passphrase"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "Take this one anyway"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, 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:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -392,18 +413,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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Yes, protection is not needed"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, 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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -413,157 +434,223 @@ msgstr[0] ""
 msgstr[1] ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, 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:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Warning: You have entered an insecure passphrase."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
+msgstr "Options used for startup"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr "run in supervised mode"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "verbose"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "be somewhat more quiet"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "use a log file for the server"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "verbose"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
+#: agent/gpg-agent.c:213
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|ALGO|use ALGO to show ssh fingerprints"
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "enable putty support"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|set maximum PIN cache lifetime to N seconds"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set maximum SSH key lifetime to N seconds"
+
+#: agent/gpg-agent.c:248
 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:250
 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:252
 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:257
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "do not allow bypassing the passphrase policy"
+
+#: agent/gpg-agent.c:267
+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:269
+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:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
+msgstr "Options controlling the PIN-Entry"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
+msgstr "never use the PIN-entry"
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
-msgstr "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr "let PIN-Entry grab keyboard and mouse"
 
-#: agent/gpg-agent.c:258
-msgid "enable ssh support"
-msgstr "enable ssh support"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|set the Pinentry timeout to N seconds"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "enable putty support"
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Please report bugs to <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -571,135 +658,143 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Note: ‘%s’ is not considered an option\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘%s’ is too long\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "trying to steal socket from running %s\n"
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘%s’\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "can't create directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘%s’ created\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘%s’ as home directory\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, 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:2824
+#: agent/gpg-agent.c:2806
 #, 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:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no gpg-agent running in this session\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Options:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -712,8 +807,8 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -721,9 +816,8 @@ msgstr ""
 "@Commands:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -779,43 +873,43 @@ msgstr "cancelled\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error while asking for the passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error opening '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "file '%s', line %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "statement “%s� ignored in '%s', line %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system trustlist ‘%s’ not available\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "bad fingerprint in '%s', line %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "invalid keyflag in '%s', line %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error reading '%s', line %d: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error reading list of trusted root certificates\n"
@@ -828,7 +922,7 @@ msgstr "error reading list of trusted root certificates\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -837,11 +931,11 @@ msgstr ""
 "Do you ultimately trust%%0A  “%s�%%0Ato correctly certify user "
 "certificates?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -854,7 +948,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -866,20 +960,20 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "Correct"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "Wrong"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Note: This passphrase has never been changed.%0APlease change it now."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -888,15 +982,15 @@ msgstr ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Change passphrase"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "I'll change it later"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -905,11 +999,11 @@ msgstr ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "Delete key"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -942,7 +1036,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "public key algorithm %d (%s) is not supported\n"
@@ -957,52 +1051,52 @@ msgstr "protection algorithm %d (%s) is not supported\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "protection hash algorithm %d (%s) is not supported\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error creating a pipe: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "error creating a stream for a pipe: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error forking process: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "waiting for process %d to terminate failed: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "error running '%s': probably not installed\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "error running '%s': exit status %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "error running '%s': terminated\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "waiting for processes to terminate failed: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error getting exit code of process %d: %s\n"
@@ -1032,12 +1126,12 @@ msgstr "Warning: unsafe ownership on %s “%s�\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Warning: unsafe permissions on %s “%s�\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "waiting for file ‘%s’ to become accessible ...\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
@@ -1097,22 +1191,22 @@ 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:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error allocating enough memory: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: obsolete option “%s� - it has no effect\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: “%s%s� is an obsolete option - it has no effect\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "unknown debug flag ‘%s’ ignored\n"
@@ -1412,7 +1506,7 @@ msgstr "invalid option"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "missing argument for option “%.50s�\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “%.50s�\n"
@@ -1442,17 +1536,17 @@ msgstr "command “%.50s� is ambiguous\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "invalid option “%.50s�\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "Note: no default option file ‘%s’\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "option file '%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr "Note: ignoring option “--%s� due to global config\n"
@@ -1472,41 +1566,41 @@ msgstr "iconv_open failed: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "failed to create temporary file '%s': %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "error writing to '%s': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "removing stale lockfile (created by %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "waiting for lock (held by %d%s) %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(deadlock?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lock ‘%s’ not made: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "waiting for lock %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
@@ -1730,22 +1824,22 @@ msgstr "unacceptable HTTP redirect from server was cleaned up"
 msgid "server uses an invalid certificate"
 msgstr "server uses an invalid certificate"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, c-format
 msgid "Note: %s\n"
 msgstr "Note: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, 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:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1761,8 +1855,8 @@ msgstr "This command is only available for version 2 cards\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1772,120 +1866,120 @@ msgstr "Your selection? "
 msgid "[not set]"
 msgstr "[not set]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "not forced"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "forced"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: Only plain ASCII is currently allowed.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: The “<� character may not be used.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: Double spaces are not allowed.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Cardholder's surname: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Cardholder's given name: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "URL to retrieve public key: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error reading '%s': %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error writing '%s': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Login data (account name): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Private DO data: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Language preferences: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: invalid length of preference string.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: invalid characters in preference string.\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Salutation (M = Mr., F = Ms., or space): "
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Error: invalid response.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: invalid formatted fingerprint.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "key operation not possible: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "not an OpenPGP card"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error getting current key info: %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Replace existing key? (y/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1895,97 +1989,97 @@ msgstr ""
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "What keysize do you want? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s keysizes must be in the range %u-%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr "Changing card key attribute for: "
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 msgid "Signature key\n"
 msgstr "Signature key\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 msgid "Encryption key\n"
 msgstr "Encryption key\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr "Authentication key\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error getting card info: %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Make off-card backup of encryption key? (Y/n) "
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Replace existing keys? (y/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1996,165 +2090,165 @@ msgstr ""
 "   PIN = ‘%s’     Admin PIN = ‘%s’\n"
 "You should change them using the command --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 msgid "Please select the type of key to generate:\n"
 msgstr "Please select the type of key to generate:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signature key\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Encryption key\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentication key\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "Please select where to store the key:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD failed: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr "Continue? (y/N) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Really do a factory reset? (enter “yes�) "
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error for setup KDF: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "show admin commands"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "list all available data"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "change card holder's name"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "change URL to retrieve key"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "fetch the key specified in the card URL"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "change the login name"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "change the language preferences"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr "change card holder's salutation"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "change a CA fingerprint"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "toggle the signature force PIN flag"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "generate new keys"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "menu to change or unblock the PIN"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "verify the PIN and list all data"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "unblock the PIN using a Reset Code"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr "destroy all keys and data"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr "setup KDF for PIN authentication"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 msgid "change the key attribute"
 msgstr "change the key attribute"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "Admin-only command\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Admin commands are allowed\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "Admin commands are not allowed\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help�)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "can't open ‘%s’\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "key “%s� not found: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2213,8 +2307,8 @@ msgid "subkey"
 msgstr "subkey"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
@@ -2254,24 +2348,24 @@ msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
 msgid "using cipher %s\n"
 msgstr "using cipher %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘%s’ already compressed\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "WARNING: ‘%s’ is an empty file\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "cipher algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "digest algorithm ‘%s’ may not be used in %s mode\n"
@@ -2293,7 +2387,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: key %s is not suitable for encryption in %s mode\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr "operation forced to fail due to unfulfilled compliance rules\n"
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2302,39 +2402,39 @@ msgstr ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s encrypted for: “%s�\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "option ‘%s’ may not be used in %s mode\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s encrypted data\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem handling encrypted packet\n"
@@ -2515,212 +2615,260 @@ msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "using subkey %s instead of primary key %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "make a signature"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "make a clear text signature"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "quickly generate a new key pair"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr "quickly add a new user-id"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr "quickly revoke a user-id"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr "quickly set a new expiration date"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "full featured key pair generation"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "quickly sign a key"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "quickly sign a key locally"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "quickly revoke a key signature"
 msgstr "quickly revoke a key signature"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "export keys to a keyserver"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "import keys from a keyserver"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "search for keys on a keyserver"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|set the TOFU policy for a key"
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr "Options controlling the input"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr "Options controlling the output"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|USER-ID|encrypt for USER-ID"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|USER-ID|use USER-ID to sign or decrypt"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "use canonical text mode"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr "Options controlling key import and export"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|FILE|write output to FILE"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "do not make any changes"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "prompt before overwriting"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr "Options controlling key listings"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "use strict OpenPGP behavior"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+msgid "Options to specify keys"
+msgstr "Options to specify keys"
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|use USER-ID to sign or decrypt"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr "Options for unattended use"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr "Other options"
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2728,7 +2876,7 @@ msgstr ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2748,11 +2896,11 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2762,7 +2910,7 @@ msgstr ""
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2770,73 +2918,73 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "usage: %s [options] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2844,19 +2992,19 @@ msgstr ""
 "WARNING: unsafe enclosing directory ownership on configuration file ‘"
 "%s’\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2864,451 +3012,451 @@ msgstr ""
 "WARNING: unsafe enclosing directory permissions on configuration file ‘"
 "%s’\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘%s’\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “help� to list choices)\n"
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "This command is not allowed while in %s mode.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s� is not a proper mail address\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘%s’\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘%s’\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "validate signatures with PKA data"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "elevate the trust of signatures with valid PKA data"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error parsing key specification '%s': %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, 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:5134
+#: g10/gpg.c:5132
 #, 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:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
@@ -3321,7 +3469,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
@@ -4019,7 +4167,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Are you sure you still want to sign it? (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Unable to sign.\n"
 
@@ -4194,8 +4342,8 @@ msgstr "I have checked this key very carefully.\n"
 msgid "Really sign? (y/N) "
 msgstr "Really sign? (y/N) "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
@@ -4386,7 +4534,7 @@ msgstr ""
 "signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
@@ -4434,7 +4582,7 @@ msgstr "Really remove this user ID? (y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Really move the primary key? (y/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "You must select exactly one key.\n"
 
@@ -4509,161 +4657,161 @@ msgstr "Save changes? (y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Quit without saving? (y/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:2476
+#: g10/keyedit.c:2532
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoking the user ID failed: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "setting the primary user ID failed: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "“%s� is not a fingerprint\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“%s� is not the primary fingerprint\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Invalid user ID '%s': %s\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "No matching user IDs."
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Not signed by you.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "revoking the key signature failed: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’ is not a valid expiration time\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s� is not a proper fingerprint\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subkey “%s� not found\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Features: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Preferred keyserver: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Notations: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "The following key was revoked on %s by %s key %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "This key may be revoked by %s key %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "usage: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "card-no: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4671,17 +4819,17 @@ msgstr ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4690,17 +4838,17 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNING: Your encryption subkey expires soon.\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "You may want to change its expiration date too.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4710,72 +4858,72 @@ msgstr ""
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Are you sure you still want to add it? (y/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Such a user ID already exists on this key!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Deleted %d signature.\n"
 msgstr[1] "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "invalid"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID “%s� compacted: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User ID “%s�: %d signature removed\n"
 msgstr[1] "User ID “%s�: %d signatures removed\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID “%s�: already minimized\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID “%s�: already clean\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4785,40 +4933,40 @@ msgstr ""
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "you cannot appoint a key as its own designated revoker\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "this key has already been designated as a revoker\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4826,171 +4974,171 @@ msgstr ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changing expiration time for a subkey.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "You can't change the expiration date of a v3 key\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 msgid "Changing usage of a subkey.\n"
 msgstr "Changing usage of a subkey.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 msgid "Changing usage of the primary key.\n"
 msgstr "Changing usage of the primary key.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signing subkey %s is already cross-certified\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "skipping v3 self-signature on user ID “%s�\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 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:5344
+#: g10/keyedit.c:5400
 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:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “%s�\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, 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:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s� is already revoked\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5448,7 +5596,7 @@ msgstr ""
 "generator a better chance to gain enough entropy.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
@@ -5517,11 +5665,11 @@ msgstr "no writable public keyring found: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error writing public keyring '%s': %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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"
@@ -5529,36 +5677,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, 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:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, 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:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Really create? (y/N) "
 
@@ -5766,82 +5914,82 @@ msgstr "requesting key from ‘%s’\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNING: unable to fetch URI %s: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "weird size for an encrypted session key (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s encrypted session key\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passphrase generated with unknown digest algorithm %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "public key is %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s�\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "encrypted with %s key, ID %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNING: multiple plaintexts seen\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "assuming %s encrypted data\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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"
@@ -5851,179 +5999,179 @@ msgstr ""
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 
-#: g10/mainproc.c:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Use the option ‘%s’ to decrypt anyway.\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decryption forced to fail!\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Note: sender requested “for-your-eyes-only�\n"
 
-#: g10/mainproc.c:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import� to apply\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "no signature found\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "BAD signature from “%s�"
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Expired signature from “%s�"
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Good signature from “%s�"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "can't handle this ambiguous signature data\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               using %s key %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               issuer “%s�\n"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, 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:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka “%s�"
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, digest algorithm %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ", key algorithm "
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, 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:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
@@ -6088,70 +6236,70 @@ msgstr "(reported error: %s <%s>)\n"
 msgid "(further info: "
 msgstr "(further info: "
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: deprecated option “%s�\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: “%s� is a deprecated option\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "please use “%s%s� instead\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: “%s� is a deprecated command - do not use it\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 "%s:%u: “%s� is obsolete in this file - it only has effect in %s\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr ""
 "WARNING: “%s%s� is an obsolete option - it has no effect except on %s\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Uncompressed"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "uncompressed|none"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "this message may not be usable by %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "ambiguous option ‘%s’\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "unknown option ‘%s’\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "unknown weak digest ‘%s’\n"
@@ -6184,22 +6332,22 @@ msgstr "writing to stdout\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "assuming signed data in ‘%s’\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "can't handle public key algorithm %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Unknown critical signature notation: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacket of type %d has critical bit set\n"
@@ -6607,12 +6755,12 @@ msgstr "unknown default recipient “%s�\n"
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Note: key %s has no %s feature\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Note: key %s has no preference for %s\n"
@@ -7032,7 +7180,7 @@ 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!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, type %d: write failed: %s\n"
@@ -7077,7 +7225,7 @@ msgstr "error finding trust record in '%s': %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "read error in '%s': %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync failed: %s\n"
@@ -7587,144 +7735,144 @@ msgstr "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "‘%s’ is not a valid long keyID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "key %s: accepted as trusted key\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "key %s occurs more than once in the trustdb\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "key %s: no public key for trusted key - skipped\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "key %s marked as ultimately trusted\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu is not of requested type %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "You may try to re-create the trustdb using the commands:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "If that does not work, please consult the manual\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "using %s trust model\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "no need for a trustdb check with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "no need for a trustdb update with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "public key %s not found: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "please do a --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d key processed"
 msgstr[1] "%d keys processed"
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, 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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, 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:2290
+#: g10/trustdb.c:2333
 #, 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"
 
@@ -7736,39 +7884,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]"
 
@@ -7816,33 +7964,33 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNumber: %s%%0AHolder: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Remaining attempts: %d"
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Please enter the PIN for the standard keys."
 
@@ -7912,7 +8060,7 @@ msgstr "failed to store the fingerprint: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "failed to store the creation date: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error retrieving CHV status from card\n"
@@ -7975,7 +8123,7 @@ msgstr "PIN for CHV%d is too short; minimum length is %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "verify CHV%d failed: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "card is permanently locked!\n"
@@ -8116,14 +8264,14 @@ msgstr "card does not support digest algorithm %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "signatures created so far: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, 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:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "can't access %s - invalid OpenPGP card?\n"
@@ -8139,55 +8287,55 @@ msgstr "||Please enter your PIN at the reader's pinpad"
 msgid "|N|Initial New PIN"
 msgstr "|N|Initial New PIN"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "run in multi server mode (foreground)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|set the debugging level to LEVEL"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|write a log to FILE"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|connect to reader at port N"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|use NAME as ct-API driver"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|use NAME as PC/SC driver"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "do not use the internal CCID driver"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|disconnect the card after N seconds of inactivity"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "do not use a reader's pinpad"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "deny the use of admin card commands"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "use variable length input for pinpad"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "deny the use of admin card commands"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8195,22 +8343,28 @@ msgstr ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "please use the option ‘--daemon’ to run the program in the background\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "handler for fd %d started\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "error getting key usage information: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8268,7 +8422,7 @@ msgstr "looking up issuer at external location\n"
 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:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "can't get authorityInfoAccess: %s\n"
@@ -8427,7 +8581,7 @@ msgstr "root certificate is not marked trusted"
 msgid "checking the trust list failed: %s\n"
 msgstr "checking the trust list failed: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certificate chain too long\n"
@@ -8481,7 +8635,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "a %u bit hash is not valid for a %u bit %s key\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8492,7 +8646,7 @@ msgstr "out of core\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(this is the MD2 algorithm)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "none"
 
@@ -8527,42 +8681,37 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no key usage specified - assuming all usages\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "error getting key usage information: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certificate should not have been used for certification\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certificate should not have been used for OCSP response signing\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certificate should not have been used for encryption\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certificate should not have been used for signing\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificate is not usable for encryption\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificate is not usable for signing\n"
@@ -8750,6 +8899,11 @@ msgstr "Create self-signed certificate? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "These parameters are used:\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error creating temporary file: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "Now creating self-signed certificate.  "
@@ -8825,123 +8979,123 @@ msgstr "deleting certificate “%s� failed: %s\n"
 msgid "no valid recipients given\n"
 msgstr "no valid recipients given\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "list external keys"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "list certificate chain"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "import certificates"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "export certificates"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "register a smartcard"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "pass a command to the dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "invoke gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "create base-64 encoded output"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "assume input is in PEM format"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "assume input is in base-64 format"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "assume input is in binary format"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|use USER-ID as default secret key"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|add keyring to the list of keyrings"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "never consult a CRL"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "check validity using OCSP"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|number of certificates to include"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|FILE|take policy information from FILE"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "do not check certificate policies"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "fetch missing issuer certificates"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "don't use the terminal at all"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FILE|write an audit log to FILE"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "batch mode: never ask"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "assume yes on most questions"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "assume no on most questions"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FILE|add keyring to the list of keyrings"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|USER-ID|use USER-ID as default secret key"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|use this keyserver to lookup keys"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|use cipher algorithm NAME"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAME|use message digest algorithm NAME"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8951,27 +9105,27 @@ msgstr ""
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "unknown validation model ‘%s’\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importing common certificates ‘%s’\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "can't sign using '%s': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "invalid command (there is no implicit command)\n"
@@ -9031,7 +9185,7 @@ msgstr "problem re-searching certificate: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "error storing flags: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Error - "
 
@@ -9067,7 +9221,7 @@ msgstr ""
 "\n"
 "%s%sAre you really sure that you want to do this?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9117,24 +9271,24 @@ msgstr "[date not given]"
 msgid "algorithm:"
 msgstr "algorithm:"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 "invalid signature: message digest attribute does not match computed one\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Good signature from"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "                aka"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "This is a qualified signature\n"
@@ -9910,112 +10064,135 @@ msgstr "absolute file name expected\n"
 msgid "looking up '%s'\n"
 msgstr "looking up ‘%s’\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "list the contents of the CRL cache"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|load CRL from FILE into cache"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|fetch a CRL from URL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "shutdown the dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "flush the cache"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr "allow online software version check"
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "run without asking a user"
+#: dirmngr/dirmngr.c:218
+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:196
-msgid "force loading of outdated CRLs"
-msgstr "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr "Network related options"
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
+msgstr "route all network traffic via Tor"
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
-msgstr "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
+#: dirmngr/dirmngr.c:244
+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:247
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "inhibit the use of HTTP"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "inhibit the use of LDAP"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignore HTTP CRL distribution points"
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
-msgstr "ignore LDAP CRL distribution points"
-
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "ignore certificate contained OCSP service URLs"
-
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirect all HTTP requests to URL"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|use HOST for LDAP queries"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "do not use fallback hosts with --ldap-proxy"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|read LDAP server list from FILE"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 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:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|set LDAP timeout to N seconds"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|use OCSP responder at URL"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP response signed by FPR"
 
-#: dirmngr/dirmngr.c:235
-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:240
-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
-msgid "route all network traffic via Tor"
-msgstr "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10025,11 +10202,11 @@ msgstr ""
 "(See the “info� manual for a complete listing of all commands and "
 "options)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10037,83 +10214,83 @@ msgstr ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "valid debug levels are: %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "usage: %s [options] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: line too long - skipped\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: invalid fingerprint detected\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: read error: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, 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:1955
+#: dirmngr/dirmngr.c:1949
 #, 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:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 received - no action defined\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM received - shutting down ...\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM received - still %d active connections\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "shutdown forced\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT received - immediate shutdown\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d received - no action defined\n"
@@ -10303,91 +10480,91 @@ msgstr "hashing the OCSP response for ‘%s’ failed: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "not signed by a default OCSP signer's certificate"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 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:540 dirmngr/ocsp.c:727
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "error getting responder ID: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 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:636
 #, 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:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no default OCSP responder defined\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "no default OCSP signer defined\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "using default OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "using OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, 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:792
 #, 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:793
 msgid "good"
 msgstr "good"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, 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:846
 #, 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:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP responder returned an too old status\n"
@@ -10397,67 +10574,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:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "serialno missing in cert ID"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire failed: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url failed: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error sending data: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch failed: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert failed: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d exceeded\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "can't allocate control structure: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "failed to allocate assuan context: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "failed to initialize the server: %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept problem: %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan processing failed: %s\n"
@@ -10500,7 +10677,7 @@ msgstr "certificate chain is good\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certificate should not have been used for CRL signing\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "quiet"
 
@@ -10593,275 +10770,132 @@ msgstr "sending line failed: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "error sending standard options: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Options controlling the diagnostic output"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Options controlling the configuration"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Options useful for debugging"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Options controlling the security"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|expire SSH keys after N seconds"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|set maximum PIN cache lifetime to N seconds"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|set maximum SSH key lifetime to N seconds"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Options enforcing a passphrase policy"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "do not allow bypassing the passphrase policy"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|set minimal required length for new passphrases to N"
-
-#: tools/gpgconf-comp.c:580
-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"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|FILE|check new passphrases against pattern in FILE"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|expire the passphrase after N days"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "do not allow the reuse of old passphrases"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|set the Pinentry timeout to N seconds"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|use NAME as default secret key"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAME|encrypt to user ID NAME as well"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|set up email aliases"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "Configuration for Keyservers"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL|use keyserver at URL"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "allow PKA lookups (DNS requests)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-
-#: tools/gpgconf-comp.c:764
-msgid "import missing key from a signature"
-msgstr "import missing key from a signature"
-
-#: tools/gpgconf-comp.c:767
-msgid "include the public key in signatures"
-msgstr "include the public key in signatures"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "disable all access to the dirmngr"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "do not check CRLs for root certificates"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Options controlling the format of the output"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Options controlling the interactivity and enforcement"
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr "Options controlling the use of Tor"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "Configuration for HTTP servers"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "use system's HTTP proxy setting"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "Configuration of LDAP servers to use"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "LDAP server list"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "Configuration for OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr "Private Keys"
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr "Smartcards"
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr "Network"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr "Passphrase Entry"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "Component not suitable for launching"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Configuration file of component %s is broken\n"
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "External verification of component %s failed"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Note that group specifications are ignored\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error closing ‘%s’\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error parsing ‘%s’\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "list all components"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "check all programs"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|list options"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|change options"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|check options"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "apply global default values"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|update configuration files using FILE"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "get the configuration directories for @GPGCONF@"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "list global configuration file"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "check global configuration file"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr "query the software version database"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "reload all or a given component"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "launch a given component"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "kill a given component"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "use as output file"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "activate changes at runtime, if possible"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Usage: @GPGCONF@ [options] (-h for help)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10869,15 +10903,15 @@ msgstr ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Need one component argument"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Component not found"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "No argument allowed"
 
diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index fa3ee62..b46a755 100644
--- a/po/en@quot.gmo
+++ b/po/en@quot.gmo
diff --git a/po/en@quot.po b/po/en@quot.po
index 525dc1e..92aadd0 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -1,7 +1,7 @@
 # English translations for GNU gnupg package.
-# Copyright (C) 2021 Free Software Foundation, Inc.
+# Copyright (C) 2022 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNU gnupg package.
-# Automatically generated, 2021.
+# Automatically generated, 2022.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.2.33\n"
+"Project-Id-Version: GNU gnupg 2.2.37\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-11-23 10:54+0100\n"
-"PO-Revision-Date: 2021-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+0200\n"
+"PO-Revision-Date: 2022-08-24 15:33+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -155,8 +155,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "does not match - try again"
 
@@ -201,62 +201,92 @@ msgstr "Bad PIN"
 msgid "Bad Passphrase"
 msgstr "Bad Passphrase"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr "Note: Request from the web browser."
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr "Note: Request from a remote site."
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "error getting serial number of card: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Please re-enter this passphrase"
+
+#: agent/command.c:2423
+#, c-format
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh keys greater than %d bits are not supported\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "can't create '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "can't open '%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "error getting serial number of card: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "detected card with S/N: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "no authentication key for ssh on card: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "no suitable card key found: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error getting list of cards: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -265,24 +295,20 @@ msgstr ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "Allow"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "Deny"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Please re-enter this passphrase"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -291,96 +317,91 @@ msgstr ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "failed to create stream from socket: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "Please insert the card with serial number"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "Please remove the current card and insert the one with serial number"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "Admin PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Reset Code"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr "Push ACK button on card/token."
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr "Use the reader's pinpad for input."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Repeat this Reset Code"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "Repeat this PUK"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Repeat this PIN"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Reset Code not correctly repeated; try again"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK not correctly repeated; try again"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN not correctly repeated; try again"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Please enter the PIN%s%s%s to unlock the card"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "error creating temporary file: %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "error writing to temporary file: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "error writing to pipe: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Enter new passphrase"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "Take this one anyway"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, 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:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -389,18 +410,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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Yes, protection is not needed"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, 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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -410,157 +431,223 @@ msgstr[0] ""
 msgstr[1] ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, 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:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Warning: You have entered an insecure passphrase."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
+msgstr "Options used for startup"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr "run in supervised mode"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "verbose"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "be somewhat more quiet"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "use a log file for the server"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "verbose"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|write server mode logs to FILE"
+
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|use PGM as the SCdaemon program"
+
+#: agent/gpg-agent.c:213
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|ALGO|use ALGO to show ssh fingerprints"
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "enable putty support"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|set maximum PIN cache lifetime to N seconds"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set maximum SSH key lifetime to N seconds"
+
+#: agent/gpg-agent.c:248
 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:250
 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:252
 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:257
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "do not allow bypassing the passphrase policy"
+
+#: agent/gpg-agent.c:267
+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:269
+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:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
+msgstr "Options controlling the PIN-Entry"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
+msgstr "never use the PIN-entry"
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
-msgstr "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr "let PIN-Entry grab keyboard and mouse"
 
-#: agent/gpg-agent.c:258
-msgid "enable ssh support"
-msgstr "enable ssh support"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|set the Pinentry timeout to N seconds"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "enable putty support"
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Please report bugs to <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -568,135 +655,143 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Note: ‘%s’ is not considered an option\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘%s’ is too long\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "trying to steal socket from running %s\n"
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘%s’\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "can't create directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘%s’ created\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘%s’ as home directory\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, 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:2824
+#: agent/gpg-agent.c:2806
 #, 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:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no gpg-agent running in this session\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Options:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -709,8 +804,8 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -718,9 +813,8 @@ msgstr ""
 "@Commands:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -776,43 +870,43 @@ msgstr "cancelled\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error while asking for the passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error opening '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "file '%s', line %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "statement “%s� ignored in '%s', line %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system trustlist ‘%s’ not available\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "bad fingerprint in '%s', line %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "invalid keyflag in '%s', line %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error reading '%s', line %d: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error reading list of trusted root certificates\n"
@@ -825,7 +919,7 @@ msgstr "error reading list of trusted root certificates\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -833,11 +927,11 @@ msgid ""
 msgstr ""
 "Do you ultimately trust%%0A  “%s�%%0Ato correctly certify user certificates?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -850,7 +944,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -862,20 +956,20 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "Correct"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "Wrong"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Note: This passphrase has never been changed.%0APlease change it now."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -884,15 +978,15 @@ msgstr ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Change passphrase"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "I'll change it later"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -901,11 +995,11 @@ msgstr ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "Delete key"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -938,7 +1032,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "public key algorithm %d (%s) is not supported\n"
@@ -953,52 +1047,52 @@ msgstr "protection algorithm %d (%s) is not supported\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "protection hash algorithm %d (%s) is not supported\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error creating a pipe: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "error creating a stream for a pipe: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error forking process: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "waiting for process %d to terminate failed: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "error running '%s': probably not installed\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "error running '%s': exit status %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "error running '%s': terminated\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "waiting for processes to terminate failed: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error getting exit code of process %d: %s\n"
@@ -1028,12 +1122,12 @@ msgstr "Warning: unsafe ownership on %s “%s�\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Warning: unsafe permissions on %s “%s�\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "waiting for file ‘%s’ to become accessible ...\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
@@ -1093,22 +1187,22 @@ 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:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error allocating enough memory: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: obsolete option “%s� - it has no effect\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: “%s%s� is an obsolete option - it has no effect\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "unknown debug flag ‘%s’ ignored\n"
@@ -1408,7 +1502,7 @@ msgstr "invalid option"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "missing argument for option “%.50s�\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “%.50s�\n"
@@ -1438,17 +1532,17 @@ msgstr "command “%.50s� is ambiguous\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "invalid option “%.50s�\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "Note: no default option file ‘%s’\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "option file '%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr "Note: ignoring option “--%s� due to global config\n"
@@ -1468,41 +1562,41 @@ msgstr "iconv_open failed: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "failed to create temporary file '%s': %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "error writing to '%s': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "removing stale lockfile (created by %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "waiting for lock (held by %d%s) %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(deadlock?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lock ‘%s’ not made: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "waiting for lock %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
@@ -1726,22 +1820,22 @@ msgstr "unacceptable HTTP redirect from server was cleaned up"
 msgid "server uses an invalid certificate"
 msgstr "server uses an invalid certificate"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, c-format
 msgid "Note: %s\n"
 msgstr "Note: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, 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:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1757,8 +1851,8 @@ msgstr "This command is only available for version 2 cards\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1768,120 +1862,120 @@ msgstr "Your selection? "
 msgid "[not set]"
 msgstr "[not set]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "not forced"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "forced"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: Only plain ASCII is currently allowed.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: The “<� character may not be used.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: Double spaces are not allowed.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Cardholder's surname: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Cardholder's given name: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "URL to retrieve public key: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error reading '%s': %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error writing '%s': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Login data (account name): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Private DO data: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Language preferences: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: invalid length of preference string.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: invalid characters in preference string.\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Salutation (M = Mr., F = Ms., or space): "
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Error: invalid response.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: invalid formatted fingerprint.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "key operation not possible: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "not an OpenPGP card"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error getting current key info: %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Replace existing key? (y/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1891,97 +1985,97 @@ msgstr ""
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "What keysize do you want? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s keysizes must be in the range %u-%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr "Changing card key attribute for: "
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 msgid "Signature key\n"
 msgstr "Signature key\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 msgid "Encryption key\n"
 msgstr "Encryption key\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr "Authentication key\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error getting card info: %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Make off-card backup of encryption key? (Y/n) "
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Replace existing keys? (y/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1992,165 +2086,165 @@ msgstr ""
 "   PIN = ‘%s’     Admin PIN = ‘%s’\n"
 "You should change them using the command --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 msgid "Please select the type of key to generate:\n"
 msgstr "Please select the type of key to generate:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signature key\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Encryption key\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentication key\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "Please select where to store the key:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD failed: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr "Continue? (y/N) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Really do a factory reset? (enter “yes�) "
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error for setup KDF: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "show admin commands"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "list all available data"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "change card holder's name"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "change URL to retrieve key"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "fetch the key specified in the card URL"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "change the login name"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "change the language preferences"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr "change card holder's salutation"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "change a CA fingerprint"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "toggle the signature force PIN flag"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "generate new keys"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "menu to change or unblock the PIN"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "verify the PIN and list all data"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "unblock the PIN using a Reset Code"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr "destroy all keys and data"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr "setup KDF for PIN authentication"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 msgid "change the key attribute"
 msgstr "change the key attribute"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "Admin-only command\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Admin commands are allowed\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "Admin commands are not allowed\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help�)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "can't open ‘%s’\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "key “%s� not found: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2209,8 +2303,8 @@ msgid "subkey"
 msgstr "subkey"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
@@ -2250,24 +2344,24 @@ msgstr "can't use a symmetric ESK packet due to the S2K mode\n"
 msgid "using cipher %s\n"
 msgstr "using cipher %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘%s’ already compressed\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "WARNING: ‘%s’ is an empty file\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "cipher algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "digest algorithm ‘%s’ may not be used in %s mode\n"
@@ -2289,7 +2383,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: key %s is not suitable for encryption in %s mode\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr "operation forced to fail due to unfulfilled compliance rules\n"
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2298,39 +2398,39 @@ msgstr ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s encrypted for: “%s�\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "option ‘%s’ may not be used in %s mode\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s encrypted data\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem handling encrypted packet\n"
@@ -2511,212 +2611,260 @@ msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "using subkey %s instead of primary key %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "make a signature"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "make a clear text signature"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "quickly generate a new key pair"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr "quickly add a new user-id"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr "quickly revoke a user-id"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr "quickly set a new expiration date"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "full featured key pair generation"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "quickly sign a key"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "quickly sign a key locally"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "quickly revoke a key signature"
 msgstr "quickly revoke a key signature"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "export keys to a keyserver"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "import keys from a keyserver"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "search for keys on a keyserver"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|set the TOFU policy for a key"
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr "Options controlling the input"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr "Options controlling the output"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|USER-ID|encrypt for USER-ID"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|USER-ID|use USER-ID to sign or decrypt"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "use canonical text mode"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr "Options controlling key import and export"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|FILE|write output to FILE"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "do not make any changes"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "prompt before overwriting"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr "Options controlling key listings"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "use strict OpenPGP behavior"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+msgid "Options to specify keys"
+msgstr "Options to specify keys"
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|use USER-ID to sign or decrypt"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr "Options for unattended use"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr "Other options"
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2724,7 +2872,7 @@ msgstr ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2744,11 +2892,11 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2758,7 +2906,7 @@ msgstr ""
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2766,539 +2914,539 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "usage: %s [options] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, 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:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, 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:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘%s’\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “help� to list choices)\n"
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "This command is not allowed while in %s mode.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s� is not a proper mail address\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘%s’\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘%s’\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "validate signatures with PKA data"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "elevate the trust of signatures with valid PKA data"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error parsing key specification '%s': %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, 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:5134
+#: g10/gpg.c:5132
 #, 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:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
@@ -3311,7 +3459,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
@@ -4009,7 +4157,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Are you sure you still want to sign it? (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Unable to sign.\n"
 
@@ -4183,8 +4331,8 @@ msgstr "I have checked this key very carefully.\n"
 msgid "Really sign? (y/N) "
 msgstr "Really sign? (y/N) "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
@@ -4374,7 +4522,7 @@ msgstr ""
 "  a ‘t’ for trust signatures (tsign), an ‘nr’ for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
@@ -4422,7 +4570,7 @@ msgstr "Really remove this user ID? (y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Really move the primary key? (y/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "You must select exactly one key.\n"
 
@@ -4497,161 +4645,161 @@ msgstr "Save changes? (y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Quit without saving? (y/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:2476
+#: g10/keyedit.c:2532
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoking the user ID failed: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "setting the primary user ID failed: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "“%s� is not a fingerprint\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“%s� is not the primary fingerprint\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Invalid user ID '%s': %s\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "No matching user IDs."
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Not signed by you.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "revoking the key signature failed: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’ is not a valid expiration time\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s� is not a proper fingerprint\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subkey “%s� not found\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Features: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Preferred keyserver: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Notations: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "The following key was revoked on %s by %s key %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "This key may be revoked by %s key %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "usage: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "card-no: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4659,17 +4807,17 @@ msgstr ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4678,17 +4826,17 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNING: Your encryption subkey expires soon.\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "You may want to change its expiration date too.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4698,72 +4846,72 @@ msgstr ""
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Are you sure you still want to add it? (y/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Such a user ID already exists on this key!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Deleted %d signature.\n"
 msgstr[1] "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "invalid"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID “%s� compacted: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User ID “%s�: %d signature removed\n"
 msgstr[1] "User ID “%s�: %d signatures removed\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID “%s�: already minimized\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID “%s�: already clean\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4773,40 +4921,40 @@ msgstr ""
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "you cannot appoint a key as its own designated revoker\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "this key has already been designated as a revoker\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4814,171 +4962,171 @@ msgstr ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changing expiration time for a subkey.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "You can't change the expiration date of a v3 key\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 msgid "Changing usage of a subkey.\n"
 msgstr "Changing usage of a subkey.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 msgid "Changing usage of the primary key.\n"
 msgstr "Changing usage of the primary key.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signing subkey %s is already cross-certified\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "skipping v3 self-signature on user ID “%s�\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 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:5344
+#: g10/keyedit.c:5400
 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:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “%s�\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, 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:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s� is already revoked\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5436,7 +5584,7 @@ msgstr ""
 "generator a better chance to gain enough entropy.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
@@ -5505,11 +5653,11 @@ msgstr "no writable public keyring found: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error writing public keyring '%s': %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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,36 +5665,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, 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:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, 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:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Really create? (y/N) "
 
@@ -5754,82 +5902,82 @@ msgstr "requesting key from ‘%s’\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNING: unable to fetch URI %s: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "weird size for an encrypted session key (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s encrypted session key\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passphrase generated with unknown digest algorithm %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "public key is %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s�\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "encrypted with %s key, ID %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNING: multiple plaintexts seen\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "assuming %s encrypted data\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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"
@@ -5839,179 +5987,179 @@ msgstr ""
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 
-#: g10/mainproc.c:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Use the option ‘%s’ to decrypt anyway.\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decryption forced to fail!\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Note: sender requested “for-your-eyes-only�\n"
 
-#: g10/mainproc.c:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import� to apply\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "no signature found\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "BAD signature from “%s�"
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Expired signature from “%s�"
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Good signature from “%s�"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "can't handle this ambiguous signature data\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               using %s key %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               issuer “%s�\n"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, 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:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka “%s�"
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, digest algorithm %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ", key algorithm "
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, 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:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
@@ -6076,69 +6224,69 @@ msgstr "(reported error: %s <%s>)\n"
 msgid "(further info: "
 msgstr "(further info: "
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: deprecated option “%s�\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: “%s� is a deprecated option\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "please use “%s%s� instead\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: “%s� is a deprecated command - do not use it\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: “%s� is obsolete in this file - it only has effect in %s\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr ""
 "WARNING: “%s%s� is an obsolete option - it has no effect except on %s\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Uncompressed"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "uncompressed|none"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "this message may not be usable by %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "ambiguous option ‘%s’\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "unknown option ‘%s’\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "unknown weak digest ‘%s’\n"
@@ -6171,22 +6319,22 @@ msgstr "writing to stdout\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "assuming signed data in ‘%s’\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "can't handle public key algorithm %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Unknown critical signature notation: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacket of type %d has critical bit set\n"
@@ -6594,12 +6742,12 @@ msgstr "unknown default recipient “%s�\n"
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Note: key %s has no %s feature\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Note: key %s has no preference for %s\n"
@@ -7019,7 +7167,7 @@ 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!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, type %d: write failed: %s\n"
@@ -7064,7 +7212,7 @@ msgstr "error finding trust record in '%s': %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "read error in '%s': %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync failed: %s\n"
@@ -7573,144 +7721,144 @@ msgstr "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "‘%s’ is not a valid long keyID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "key %s: accepted as trusted key\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "key %s occurs more than once in the trustdb\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "key %s: no public key for trusted key - skipped\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "key %s marked as ultimately trusted\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu is not of requested type %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "You may try to re-create the trustdb using the commands:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "If that does not work, please consult the manual\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "using %s trust model\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "no need for a trustdb check with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "no need for a trustdb update with ‘%s’ trust model\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "public key %s not found: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "please do a --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d key processed"
 msgstr[1] "%d keys processed"
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, 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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, 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:2290
+#: g10/trustdb.c:2333
 #, 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"
 
@@ -7722,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]"
 
@@ -7802,33 +7950,33 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNumber: %s%%0AHolder: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Remaining attempts: %d"
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Please enter the PIN for the standard keys."
 
@@ -7898,7 +8046,7 @@ msgstr "failed to store the fingerprint: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "failed to store the creation date: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error retrieving CHV status from card\n"
@@ -7961,7 +8109,7 @@ msgstr "PIN for CHV%d is too short; minimum length is %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "verify CHV%d failed: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "card is permanently locked!\n"
@@ -8102,14 +8250,14 @@ msgstr "card does not support digest algorithm %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "signatures created so far: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, 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:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "can't access %s - invalid OpenPGP card?\n"
@@ -8125,55 +8273,55 @@ msgstr "||Please enter your PIN at the reader's pinpad"
 msgid "|N|Initial New PIN"
 msgstr "|N|Initial New PIN"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "run in multi server mode (foreground)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|set the debugging level to LEVEL"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|write a log to FILE"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|connect to reader at port N"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|use NAME as ct-API driver"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|use NAME as PC/SC driver"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "do not use the internal CCID driver"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|disconnect the card after N seconds of inactivity"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "do not use a reader's pinpad"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "deny the use of admin card commands"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "use variable length input for pinpad"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "deny the use of admin card commands"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8181,22 +8329,28 @@ msgstr ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "please use the option ‘--daemon’ to run the program in the background\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "handler for fd %d started\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "error getting key usage information: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8254,7 +8408,7 @@ msgstr "looking up issuer at external location\n"
 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:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "can't get authorityInfoAccess: %s\n"
@@ -8413,7 +8567,7 @@ msgstr "root certificate is not marked trusted"
 msgid "checking the trust list failed: %s\n"
 msgstr "checking the trust list failed: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certificate chain too long\n"
@@ -8467,7 +8621,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "a %u bit hash is not valid for a %u bit %s key\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8478,7 +8632,7 @@ msgstr "out of core\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(this is the MD2 algorithm)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "none"
 
@@ -8513,42 +8667,37 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no key usage specified - assuming all usages\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "error getting key usage information: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certificate should not have been used for certification\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certificate should not have been used for OCSP response signing\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certificate should not have been used for encryption\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certificate should not have been used for signing\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificate is not usable for encryption\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificate is not usable for signing\n"
@@ -8736,6 +8885,11 @@ msgstr "Create self-signed certificate? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "These parameters are used:\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error creating temporary file: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "Now creating self-signed certificate.  "
@@ -8811,123 +8965,123 @@ msgstr "deleting certificate “%s� failed: %s\n"
 msgid "no valid recipients given\n"
 msgstr "no valid recipients given\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "list external keys"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "list certificate chain"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "import certificates"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "export certificates"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "register a smartcard"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "pass a command to the dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "invoke gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "create base-64 encoded output"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "assume input is in PEM format"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "assume input is in base-64 format"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "assume input is in binary format"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|use USER-ID as default secret key"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|add keyring to the list of keyrings"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "never consult a CRL"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "check validity using OCSP"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|number of certificates to include"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|FILE|take policy information from FILE"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "do not check certificate policies"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "fetch missing issuer certificates"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "don't use the terminal at all"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FILE|write an audit log to FILE"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "batch mode: never ask"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "assume yes on most questions"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "assume no on most questions"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FILE|add keyring to the list of keyrings"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|USER-ID|use USER-ID as default secret key"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|use this keyserver to lookup keys"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|use cipher algorithm NAME"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAME|use message digest algorithm NAME"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8937,27 +9091,27 @@ msgstr ""
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "unknown validation model ‘%s’\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importing common certificates ‘%s’\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "can't sign using '%s': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "invalid command (there is no implicit command)\n"
@@ -9017,7 +9171,7 @@ msgstr "problem re-searching certificate: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "error storing flags: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Error - "
 
@@ -9053,7 +9207,7 @@ msgstr ""
 "\n"
 "%s%sAre you really sure that you want to do this?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9103,24 +9257,24 @@ msgstr "[date not given]"
 msgid "algorithm:"
 msgstr "algorithm:"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 "invalid signature: message digest attribute does not match computed one\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Good signature from"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "                aka"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "This is a qualified signature\n"
@@ -9896,112 +10050,135 @@ msgstr "absolute file name expected\n"
 msgid "looking up '%s'\n"
 msgstr "looking up ‘%s’\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "list the contents of the CRL cache"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|load CRL from FILE into cache"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|fetch a CRL from URL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "shutdown the dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "flush the cache"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr "allow online software version check"
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "run without asking a user"
+#: dirmngr/dirmngr.c:218
+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:196
-msgid "force loading of outdated CRLs"
-msgstr "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr "Network related options"
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
+msgstr "route all network traffic via Tor"
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
-msgstr "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
+#: dirmngr/dirmngr.c:244
+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:247
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "inhibit the use of HTTP"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "inhibit the use of LDAP"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignore HTTP CRL distribution points"
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
-msgstr "ignore LDAP CRL distribution points"
-
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "ignore certificate contained OCSP service URLs"
-
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirect all HTTP requests to URL"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "inhibit the use of LDAP"
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignore LDAP CRL distribution points"
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|use HOST for LDAP queries"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "do not use fallback hosts with --ldap-proxy"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|read LDAP server list from FILE"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 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:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|set LDAP timeout to N seconds"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "allow sending OCSP requests"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignore certificate contained OCSP service URLs"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|use OCSP responder at URL"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP response signed by FPR"
 
-#: dirmngr/dirmngr.c:235
-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:240
-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
-msgid "route all network traffic via Tor"
-msgstr "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "force loading of outdated CRLs"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10010,11 +10187,11 @@ msgstr ""
 "@\n"
 "(See the “info� manual for a complete listing of all commands and options)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10022,83 +10199,83 @@ msgstr ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "valid debug levels are: %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "usage: %s [options] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: line too long - skipped\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: invalid fingerprint detected\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: read error: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, 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:1955
+#: dirmngr/dirmngr.c:1949
 #, 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:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 received - no action defined\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM received - shutting down ...\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM received - still %d active connections\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "shutdown forced\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT received - immediate shutdown\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d received - no action defined\n"
@@ -10288,91 +10465,91 @@ msgstr "hashing the OCSP response for ‘%s’ failed: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "not signed by a default OCSP signer's certificate"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 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:540 dirmngr/ocsp.c:727
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "error getting responder ID: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 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:636
 #, 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:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no default OCSP responder defined\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "no default OCSP signer defined\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "using default OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "using OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, 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:792
 #, 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:793
 msgid "good"
 msgstr "good"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, 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:846
 #, 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:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP responder returned an too old status\n"
@@ -10382,67 +10559,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:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "serialno missing in cert ID"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire failed: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url failed: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error sending data: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch failed: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert failed: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d exceeded\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "can't allocate control structure: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "failed to allocate assuan context: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "failed to initialize the server: %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept problem: %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan processing failed: %s\n"
@@ -10485,7 +10662,7 @@ msgstr "certificate chain is good\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certificate should not have been used for CRL signing\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "quiet"
 
@@ -10578,275 +10755,132 @@ msgstr "sending line failed: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "error sending standard options: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Options controlling the diagnostic output"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Options controlling the configuration"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Options useful for debugging"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Options controlling the security"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|expire SSH keys after N seconds"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|set maximum PIN cache lifetime to N seconds"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|set maximum SSH key lifetime to N seconds"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Options enforcing a passphrase policy"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "do not allow bypassing the passphrase policy"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|set minimal required length for new passphrases to N"
-
-#: tools/gpgconf-comp.c:580
-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"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|FILE|check new passphrases against pattern in FILE"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|expire the passphrase after N days"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "do not allow the reuse of old passphrases"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|set the Pinentry timeout to N seconds"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|use NAME as default secret key"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAME|encrypt to user ID NAME as well"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|set up email aliases"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "Configuration for Keyservers"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL|use keyserver at URL"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "allow PKA lookups (DNS requests)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-
-#: tools/gpgconf-comp.c:764
-msgid "import missing key from a signature"
-msgstr "import missing key from a signature"
-
-#: tools/gpgconf-comp.c:767
-msgid "include the public key in signatures"
-msgstr "include the public key in signatures"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "disable all access to the dirmngr"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "do not check CRLs for root certificates"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Options controlling the format of the output"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Options controlling the interactivity and enforcement"
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr "Options controlling the use of Tor"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "Configuration for HTTP servers"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "use system's HTTP proxy setting"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "Configuration of LDAP servers to use"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "LDAP server list"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "Configuration for OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr "Private Keys"
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr "Smartcards"
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr "Network"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr "Passphrase Entry"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "Component not suitable for launching"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Configuration file of component %s is broken\n"
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "External verification of component %s failed"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Note that group specifications are ignored\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error closing ‘%s’\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error parsing ‘%s’\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "list all components"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "check all programs"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|list options"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|change options"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|check options"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "apply global default values"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|update configuration files using FILE"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "get the configuration directories for @GPGCONF@"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "list global configuration file"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "check global configuration file"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr "query the software version database"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "reload all or a given component"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "launch a given component"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "kill a given component"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "use as output file"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "activate changes at runtime, if possible"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Usage: @GPGCONF@ [options] (-h for help)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10854,15 +10888,15 @@ msgstr ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Need one component argument"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Component not found"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "No argument allowed"
 
diff --git a/po/eo.po b/po/eo.po
index 12598d0..cfbe38b 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -136,8 +136,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr ""
 
@@ -187,13 +187,47 @@ msgstr "malbona MPI"
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "�an�i la pasfrazon"
+
+#: agent/command.c:2423
+#, 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:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -201,190 +235,173 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 msgid "can't create '%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, fuzzy, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "eraro dum kreado de pasfrazo: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "�an�i la pasfrazon"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Donu la uzantidentigilon: "
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Ripetu pasfrazon: "
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Ripetu pasfrazon: "
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ripetu pasfrazon: "
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "eraro dum kreado de pasfrazo: %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "skribas al '%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Donu pasfrazon\n"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Ĉu tamen uzi ĉi tiun �losilon? "
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, 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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -392,7 +409,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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -400,312 +417,389 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-#, fuzzy
-msgid ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
 msgstr ""
-"@\n"
-"Opcioj:\n"
-" "
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Åœlosilo estas anstataÅ­igita."
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "detala eligo"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "iom malpli da informoj"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:192
-#, fuzzy
-msgid "use a log file for the server"
-msgstr "serĉi �losilojn ĉe �losilservilo"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "detala eligo"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "iom malpli da informoj"
+
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "ne realigita"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "ne realigita"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
 #: agent/gpg-agent.c:244
-msgid "do not use the PIN cache when signing"
+msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:248
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:250
 #, 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:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:258
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:276
 #, fuzzy
-#| msgid "not supported"
-msgid "enable ssh support"
-msgstr "ne realigita"
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|uzi pasfraz-re�imon N"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:278
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:283
 #, fuzzy
-#| msgid "not supported"
-msgid "enable putty support"
-msgstr "ne realigita"
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "uzi gpg-agent"
+
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, fuzzy, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Valida atestilrevoko"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opcioj:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -717,8 +811,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -726,9 +820,8 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -782,43 +875,43 @@ msgstr "nuligita de uzanto\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "kiraso: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "kiraso: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -831,19 +924,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jes"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -856,7 +949,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -866,48 +959,48 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 #, fuzzy
 msgid "Change passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Ĉu vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 msgid "Delete key"
 msgstr "�alti �losilon"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -938,7 +1031,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -956,52 +1049,52 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
@@ -1032,12 +1125,12 @@ msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
@@ -1099,22 +1192,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1458,7 +1551,7 @@ msgstr "nevalida kiraso"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "nevalida kiraso"
@@ -1488,19 +1581,19 @@ msgstr ""
 msgid "invalid option \"%.50s\"\n"
 msgstr "nevalida kiraso"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1520,41 +1613,41 @@ msgstr "ne povas malfermi %s: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1789,23 +1882,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "krei revokatestilon"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta �losilo ne havebla"
 
-#: g10/card-util.c:91 g10/card-util.c:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
@@ -1821,8 +1914,8 @@ msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1832,230 +1925,230 @@ msgstr "Via elekto? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signoĉeno\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signoĉeno\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "ignorita: sekreta �losilo jam ĉeestas\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2063,184 +2156,184 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Ĉu vere subskribi? "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "forlasi ĉi tiun menuon"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "montri ĉi tiun helpon"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por ĉi tiu komando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2302,8 +2395,8 @@ msgid "subkey"
 msgstr "al"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
@@ -2343,26 +2436,26 @@ msgstr ""
 msgid "using cipher %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
@@ -2384,46 +2477,52 @@ msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-ĉifrita por: %s\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-ĉifritaj datenoj\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "ĉifrita per nekonata metodo %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTO: mesa�o estis ĉifrita per malforta �losilo en la simetria ĉifro.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problemo ĉe traktado de ĉifrita paketo\n"
@@ -2614,235 +2713,286 @@ msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstataŭ la ĉefa �losilo %08lX\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 #, fuzzy
 msgid "make a signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "ĉifri datenojn"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "ĉifri nur kun simetria ĉifro"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "malĉifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "subskribi aŭ redakti �losilon"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "serĉi �losilojn ĉe �losilservilo"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "aktualigi ĉiujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 #, fuzzy
 msgid "print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
-msgid "create ascii armored output"
-msgstr "krei eligon en askia kiraso"
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
+#: g10/gpg.c:596 sm/gpgsm.c:332
 #, fuzzy
-msgid "|USER-ID|encrypt for USER-ID"
+msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOMO|ĉifri por NOMO"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "fari neniajn �an�ojn"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr ""
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr ""
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr ""
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
+msgid "create ascii armored output"
+msgstr "krei eligon en askia kiraso"
+
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
 #, fuzzy
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "uzi ĉi tiun uzantidentigilon por subskribi aŭ malĉifri"
+msgid "|FILE|write output to FILE"
+msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "uzi tekstan re�imon"
+
+#: g10/gpg.c:743
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "uzi tekstan re�imon"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr ""
+
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr ""
+
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr ""
+
+#: g10/gpg.c:803 sm/gpgsm.c:324
 #, fuzzy
-msgid "|FILE|write output to FILE"
-msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "fari neniajn �an�ojn"
+#: g10/gpg.c:805 sm/gpgsm.c:326
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|NOMO|ĉifri por NOMO"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
+#: g10/gpg.c:813 sm/gpgsm.c:328
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "uzi ĉi tiun uzantidentigilon por subskribi aŭ malĉifri"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2850,7 +3000,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2880,13 +3030,13 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2901,7 +3051,7 @@ msgstr ""
 "subskribi, kontroli, ĉifri aŭ malĉifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2909,550 +3059,550 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1677
 #, 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:1654
+#: g10/gpg.c:1680
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1660
+#: g10/gpg.c:1686
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1689
 #, 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:1666
+#: g10/gpg.c:1692
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, fuzzy, c-format
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, fuzzy, c-format
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita ĉifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita ĉifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, fuzzy, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, fuzzy, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 aÅ­ 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 aŭ 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, fuzzy, c-format
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, fuzzy, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, fuzzy, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, fuzzy, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:4199
+#: g10/gpg.c:4197
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, fuzzy, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -3467,7 +3617,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
@@ -4171,7 +4321,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi �in?\n"
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -4387,8 +4537,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ĉu vere subskribi? "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -4599,7 +4749,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Åœlosilo estas revokita.\n"
@@ -4653,7 +4803,7 @@ msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almenaŭ unu �losilon.\n"
@@ -4740,205 +4890,205 @@ msgstr "Ĉu skribi �an�ojn? "
 msgid "Quit without saving? (y/N) "
 msgstr "Ĉu fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ŝlosilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Ĉi tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ĉi tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Ĉi tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4947,36 +5097,36 @@ msgstr ""
 "AVERTO: Ĉi tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        kaŭzos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Ĉu forvi�i ĉi tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Ĉu forvi�i ĉi tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Ĉu forvi�i ĉi tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Ĉu vere forvi�i ĉi tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4984,37 +5134,37 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Forvi�is %d subskribon.\n"
 msgstr[1] "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
 msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -5024,226 +5174,226 @@ msgstr ""
 "AVERTO: Ĉi tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        kaŭzos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 #, fuzzy
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTO: Ĉi tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi �in?\n"
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi �in?\n"
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ŝan�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ŝan�as la daton de eksvalidi�o de la ĉefa �losilo.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Ŝan�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Ŝan�as la daton de eksvalidi�o de la ĉefa �losilo.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 #, 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:5344
+#: g10/keyedit.c:5400
 #, 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:5404
+#: g10/keyedit.c:5460
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ĉu surskribi (j/N)? "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 #, 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:5966
+#: g10/keyedit.c:6022
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:6055
+#: g10/keyedit.c:6111
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ĉu vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5715,7 +5865,7 @@ msgstr ""
 "akiri sufiĉe da entropio.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
@@ -5784,11 +5934,11 @@ msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5797,7 +5947,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5805,7 +5955,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5813,23 +5963,23 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo aŭ "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ĉu vere krei? "
@@ -6053,267 +6203,267 @@ msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-ĉifritaj datenoj\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ĉifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile ĉifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "ĉifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "ĉifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, fuzzy, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s ĉifritajn datenojn\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, fuzzy, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "malĉifrado sukcesis\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: ĉifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti ĉi tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, fuzzy, c-format
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 #, fuzzy
 msgid "binary"
 msgstr "ĉefa"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "nekonata publik�losila metodo"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
@@ -6378,69 +6528,69 @@ msgstr "kiraso: %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, fuzzy, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ĉi tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "nekonata klaso de subskribo"
@@ -6476,22 +6626,22 @@ msgstr "skribas al la normala eligo\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "supozas subskribitajn datenojn en '%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@ -6912,12 +7062,12 @@ msgstr "nekonata implicita ricevonto '%s'\n"
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
@@ -7344,7 +7494,7 @@ msgstr ""
 "ignoris '%s': ĉi tio estas PGP-kreita ElGamal-�losilo, kiu ne estas sekura "
 "por subskribado!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -7390,7 +7540,7 @@ msgstr "eraro dum legado de dosieruja registro: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
@@ -7896,143 +8046,143 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' ne estas valida longa �losilidentigilo\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "�losilo %08lX: akceptita kiel fidata �losilo\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "�losilo %08lX aperas pli ol unufoje en la fido-datenaro\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "�losilo %08lX: mankas publika �losilo por fidata �losilo - ignorita\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "�losilo markita kiel absolute fidata.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "fido-registro %lu ne havas petitan specon %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, 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:2007
+#: g10/trustdb.c:2050
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:2077
+#: g10/trustdb.c:2120
 #, fuzzy, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 ""
 
@@ -8044,42 +8194,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 ""
 
@@ -8127,35 +8277,35 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kialo por revoko: "
 
-#: scd/app-p15.c:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "�an�i la pasfrazon"
@@ -8223,7 +8373,7 @@ msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
@@ -8288,7 +8438,7 @@ msgstr ""
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
@@ -8434,13 +8584,13 @@ msgstr "%s-subskribo de: %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -8458,81 +8608,87 @@ msgstr "�an�i la pasfrazon"
 msgid "|N|Initial New PIN"
 msgstr "Donu la uzantidentigilon: "
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "tute ne uzi la terminalon"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:179
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "malkongruaj komandoj\n"
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
-msgstr ""
-
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8591,7 +8747,7 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8762,7 +8918,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Valida atestilrevoko"
@@ -8818,7 +8974,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -8829,7 +8985,7 @@ msgstr "ne traktita"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 #, fuzzy
 msgid "none"
 msgstr "ne"
@@ -8865,42 +9021,37 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, fuzzy, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
@@ -9096,6 +9247,11 @@ msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9173,134 +9329,134 @@ msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 msgid "no valid recipients given\n"
 msgstr "nevalida respondo de agento\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 #, fuzzy
 msgid "list external keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Valida atestilrevoko"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "import certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 #, fuzzy
 msgid "export certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:258
-#, fuzzy
-msgid "create base-64 encoded output"
-msgstr "krei eligon en askia kiraso"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "tute ne uzi la terminalon"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:278
-msgid "never consult a CRL"
-msgstr ""
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "krei eligon en askia kiraso"
 
-#: sm/gpgsm.c:288
-msgid "check validity using OCSP"
-msgstr ""
+#: sm/gpgsm.c:330
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr ""
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "aldoni ĉi tiun �losilaron al la listo de �losilaroj"
 
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:299
-msgid "do not check certificate policies"
+#: sm/gpgsm.c:354
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NOMO|uzi ĉifrad-metodon NOMO por pasfrazoj"
+
+#: sm/gpgsm.c:372
+msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "tute ne uzi la terminalon"
+#: sm/gpgsm.c:380
+msgid "check validity using OCSP"
+msgstr ""
 
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:382
+msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
-#, fuzzy
-msgid "|FILE|write an audit log to FILE"
-msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOMO|uzi ĉifrad-metodon NOMO"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NOMO|uzi kompendi-metodon NOMO"
+
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" ĉe la plej multaj demandoj"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" ĉe la plej multaj demandoj"
 
-#: sm/gpgsm.c:329
+#: sm/gpgsm.c:418
 #, fuzzy
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "aldoni ĉi tiun �losilaron al la listo de �losilaroj"
-
-#: sm/gpgsm.c:332
-#, fuzzy
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-#, fuzzy
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SERVILO|uzi ĉi tiun �losilservilon por serĉi �losilojn"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOMO|uzi ĉifrad-metodon NOMO"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOMO|uzi kompendi-metodon NOMO"
+msgid "|FILE|write an audit log to FILE"
+msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9311,27 +9467,27 @@ msgstr ""
 "subskribi, kontroli, ĉifri aŭ malĉifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9391,7 +9547,7 @@ msgstr "rev? problemo en kontrolo de revoko: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr ""
 
@@ -9421,7 +9577,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9466,23 +9622,23 @@ msgstr ""
 msgid "algorithm:"
 msgstr "kiraso: %s\n"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Bona subskribo de \""
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "            alinome \""
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr "tio povas esti kaÅ­zata de mankanta mem-subskribo\n"
@@ -10276,116 +10432,140 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-msgid "run without asking a user"
-msgstr "Ĉu fini sen skribi �an�ojn? "
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:242
+#, fuzzy
+msgid "|URL|use keyserver at URL"
+msgstr "ne povis analizi URI de �losilservilo\n"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SERVILO|uzi ĉi tiun �losilservilon por serĉi �losilojn"
+
+#: dirmngr/dirmngr.c:271
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:227
-#, fuzzy
-msgid "|URL|use OCSP responder at URL"
-msgstr "ne povis analizi URI de �losilservilo\n"
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr ""
 
-#: dirmngr/dirmngr.c:229
-msgid "|FPR|OCSP response signed by FPR"
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+#: dirmngr/dirmngr.c:285
+#, fuzzy
+msgid "|URL|use OCSP responder at URL"
+msgstr "ne povis analizi URI de �losilservilo\n"
+
+#: dirmngr/dirmngr.c:287
+msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10398,95 +10578,95 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "kiraso: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ne traktita"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -10680,92 +10860,92 @@ msgstr "�an�o de permesoj de '%s' malsukcesis: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 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:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 dirmngr/validate.c:648
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Valida atestilrevoko"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Bona atestilo"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10775,68 +10955,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: dirmngr/server.c:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10882,7 +11062,7 @@ msgstr "Valida atestilrevoko"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 #, fuzzy
 msgid "quiet"
 msgstr "fini"
@@ -10976,308 +11156,157 @@ msgstr "subskribado malsukcesis: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr ""
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr ""
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr ""
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-
-#: tools/gpgconf-comp.c:588
-#, fuzzy
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|uzi pasfraz-re�imon N"
-
-#: tools/gpgconf-comp.c:592
-#, fuzzy
-msgid "do not allow the reuse of old passphrases"
-msgstr "eraro dum kreado de pasfrazo: %s\n"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-#, fuzzy
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NOMO|ĉifri por NOMO"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-#, fuzzy
-msgid "|URL|use keyserver at URL"
-msgstr "ne povis analizi URI de �losilservilo\n"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "importi �losilojn de �losilservilo"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-msgid "include the public key in signatures"
-msgstr "kontroli �losilsubskribojn"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr ""
-
-#: tools/gpgconf-comp.c:838
-#, fuzzy
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NOMO|uzi ĉifrad-metodon NOMO por pasfrazoj"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr ""
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr ""
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "reteraro"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "malbona pasfrazo"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "publika �losilo ne trovita"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "list global configuration file"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 #, fuzzy
 msgid "check global configuration file"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "aktualigi la fido-datenaron"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 #, fuzzy
 msgid "Component not found"
 msgstr "publika �losilo ne trovita"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
@@ -11294,6 +11323,27 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "skribas al '%s'\n"
+
+#, fuzzy
+#~ msgid "use a log file for the server"
+#~ msgstr "serĉi �losilojn ĉe �losilservilo"
+
+#, fuzzy
+#~ msgid "run without asking a user"
+#~ msgstr "Ĉu fini sen skribi �an�ojn? "
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "importi �losilojn de �losilservilo"
+
+#, fuzzy
+#~ msgid "include the public key in signatures"
+#~ msgstr "kontroli �losilsubskribojn"
+
+#, fuzzy
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
@@ -11422,10 +11472,6 @@ msgstr ""
 #~ msgstr "ne povas malfermi %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "eraro dum skribado de �losilaro '%s': %s\n"
-
-#, fuzzy
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "eraro dum legado de '%s': %s\n"
 
@@ -13047,9 +13093,6 @@ msgstr ""
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "neniam uzi MDC por ĉifrado"
 
-#~ msgid "use the gpg-agent"
-#~ msgstr "uzi gpg-agent"
-
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[dosiero]|skribi statusinformojn al dosiero"
 
diff --git a/po/es.gmo b/po/es.gmo
index 0cab7c3..9d1cccf 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 49e4136..37408e7 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -149,8 +149,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Frase contraseña:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "no coincide - reinténtelo"
 
@@ -204,62 +204,92 @@ msgstr "PIN incorrecto"
 msgid "Bad Passphrase"
 msgstr "Frase contraseña errónea"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, 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:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Por favor vuelva a introducir frase contraseña"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase to protect the imported object within the "
+#| "GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Introduzca la frase contraseña para proteger el objeto importado en GnuPG."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "no pueden usarse claves ssh de más de %d bits\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "no se puede crear '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "no se puede abrir '%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, 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-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "detectada tarjeta con S/N: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "no tenemos clave de certificación para ssh en la tarjeta: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "no se encuentra una clave de tarjeta adecuada: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error intentando obtener lista de tarjetas: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -268,25 +298,21 @@ msgstr ""
 "Un proceso ssh requirió el uso de la clave%%0A  %s%%0A  (%s)%%0A¿Quiere "
 "permitirlo?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "Permitir"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "Denegar"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr ""
 "Por favor introduzca la frase contraseña para la clave ssh %%0A %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Por favor vuelva a introducir frase contraseña"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -295,91 +321,87 @@ msgstr ""
 "Por favor introduzca una frase contraseña para proteger la clave secreta "
 "recibida %%0A  %s%%0A  %s%%0A  en el almacén de claves del agente gpg"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "fallo al crear un flujo desde el socket: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "Por favor inserte la tarjeta con número de serie"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "Por favor retire tarjeta actual e inserte la que tiene número de serie"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "PIN del Administrador"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Código de Reinicio"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0A Use el teclado del lector como entrada."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Repita este Código de Reinicio"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "Repita este PUK"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Repita este PIN"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Código de Reinicio repetido incorrectamente; inténtelo de nuevo"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK repetido incorrectamente; inténtelo de nuevo"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN repetido incorrectamente; inténtelo de nuevo"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Por favor introduzca el PIN%s%s%s para desbloquear la tarjeta"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "error al crear fichero temporal: %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "error escribiendo en el fichero temporal: %s\n"
+#: agent/genkey.c:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "error escribiendo en %s: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Introduzca nueva frase contraseña"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "Tomar esta de todas formas"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@ -387,7 +409,7 @@ msgstr ""
 "¡No ha introducido una frase contraseña!%0AnNo se permiten frases contraseña "
 "en blanco."
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -396,18 +418,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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Sí, no se necesita protección"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, 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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -419,159 +441,235 @@ msgstr[1] ""
 "Una frase contraseña debe tener al menos %u dígitos o %%0A caracteres "
 "especiales."
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, 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:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Aviso: ha introducido una frase contraseña insegura."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Por favor escriba la nueva frase contraseña"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Opciones:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+#, fuzzy
+#| msgid "Options useful for debugging"
+msgid "Options used for startup"
+msgstr "Opciones útiles para el depurado"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "ejecutar en modo demonio (segundo plano)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "ejecutar en modo servidor (primer plano)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr "ejecutar en modo supervisado"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "prolijo"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "algo más discreto"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "no independizarse de la consola"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "salida de datos estilo sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "salida de datos estilo csh"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|lee opciones desde FICHERO"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "no independizarse de la consola"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Opciones que controlan la salida de diagnósticos"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "usar un fichero log para el servidor"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "prolijo"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|usar PGM como el programa para entrada de PIN"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "algo más discreto"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|usar PCM como programa SCdaemon"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|escribir logs en modo servidor en FICHERO"
+
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Opciones que controlan la configuración"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "no usar SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|usar PCM como programa SCdaemon"
+
+#: agent/gpg-agent.c:213
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|aceptar algunos comandos via NAME"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorar peticiones de cambiar el TTY"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorar peticiones de cambiar el display X"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "permitir soporte de ssh-agent"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|ALGO|usar ALGO para mostrar las huellas digitales de ssh"
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "habilitar soporte de putty"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Opciones que controlan la seguridad"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|los PINs en la caché expiran en N segundos"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|las claves SSH caducan en N segundos"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|establecer vida máxima de la clave SSH en N segundos"
+
+#: agent/gpg-agent.c:248
 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:250
 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:252
 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:257
 msgid "allow presetting passphrase"
 msgstr "permitir preestablecer frase contraseña"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Opciones que fuerzan una política de frases contraseña"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "no permitir evitar la política de frases contraseña"
+
+#: agent/gpg-agent.c:267
+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:269
+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:272
+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:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|frase contraseña caduca tras N días"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "no permite reusar antiguas frases contraseña"
+
+#: agent/gpg-agent.c:281
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the PIN-Entry"
+msgstr "Opciones que controlan la seguridad"
+
+# usa
+# Vale.
+#: agent/gpg-agent.c:283
+#, fuzzy
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "usa el agente gpg"
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr "no permitir que el caller cambie la entrada de pin"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
-msgstr "permitir que Emacs pida la clave"
+#: agent/gpg-agent.c:287
+#, 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:258
-msgid "enable ssh support"
-msgstr "permitir soporte de ssh-agent"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|usar PGM como el programa para entrada de PIN"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "|ALGO|usar ALGO para mostrar las huellas digitales de ssh"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|establecer vida máxima de Pinentry en N segundos"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "habilitar soporte de putty"
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: @GPG_AGENT@ [opciones] (-h para ayuda)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -579,136 +677,144 @@ msgstr ""
 "Sintaxis: @GPG_AGENT@ [opciones] [orden [argumentos]]\n"
 "Manejo de claves privadas por @GNUPG@\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, 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:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "leyendo opciones de '%s'\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear el socket: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "el nombre de socket '%s' es demasiado largo\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error obteniendo valor único para el socket\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error enlazando el socket con '%s': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "escuchando en el socket '%s'\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "no se puede crear el directorio '%s': %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "creado el directorio '%s'\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() falló para '%s': %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "no puede usar '%s' como directorio personal\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, 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:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "manejador 0x%lx para descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, 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:2824
+#: agent/gpg-agent.c:2806
 #, 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:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, 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:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s detenido\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no hay un agente gpg ejecutándose en esta sesión\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Opciones:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Uso: gpg-preset-passphrase [opciones] KEYGRIP (-h para ayuda)\n"
@@ -725,8 +831,8 @@ msgstr ""
 # Sí, este no he podido ser yo :-) Por cierto, ¿por qué la O no se
 # puede acentuar? ¿demasiado alta?
 # ¿Quién dice que no se puede? :-)
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -734,9 +840,8 @@ msgstr ""
 "@Órdenes:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -791,43 +896,43 @@ msgstr "cancelado\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error pidiendo la frase contraseña: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error abriendo '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fichero '%s', línea %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "declaración \"%s\" ignorada en '%s', línea %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "la lista de confianza '%s' del sistema no está disponible\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "huella digital incorrecta en '%s', línea %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "opción de clave inválida en '%s', línea %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error al leer '%s', línea %d: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error al leer la lista de certificados raíz fiables\n"
@@ -840,7 +945,7 @@ msgstr "error al leer la lista de certificados raíz fiables\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -849,11 +954,11 @@ msgstr ""
 "¿Confía absolutamente en%%0A  \"%s\"%%0A para certificar correctamentelos "
 "certificados de otros usuarios?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Sí"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -866,7 +971,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -878,21 +983,21 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "Correcto"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "Incorrecto"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Nota: Esta frase contraseña nunca ha sido cambiada.%0APor favor hágalo ahora."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -901,15 +1006,15 @@ msgstr ""
 "Esta frase contraseña no se ha cambiado%%0Adesde %.4s-%.2s-%.2s.Por favor "
 "cámbiela ahora."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Cambia la frase contraseña"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "La cambiaré más tarde"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -918,11 +1023,11 @@ msgstr ""
 "¿De verdad quiere borrar la clave identificada con el keygrip%%0A  %s%%0A  "
 "%%C%%0A?"
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "Borrar clave"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -955,7 +1060,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, 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"
@@ -970,52 +1075,52 @@ msgstr "el algoritmo de protección %d (%s) no se puede usar\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "el algoritmo de protección de hash %d (%s) no se puede usar\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error al crear tubería: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "error al crear stream para una tubería: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error bifurcando procesos: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "fallo esperando que el proceso %d terminara: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "error al ejecutar '%s': probablemente no está instalado\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "error ejecutando '%s': código de salida %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "error al ejecutar '%s': terminado\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "fallo esperando que el proceso termine: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error obteniendo código de finalización del proceso: %d %s\n"
@@ -1045,12 +1150,12 @@ msgstr "Aviso: propiedad insegura de %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "esperando que el archivo '%s' esté disponible ...\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renombrar '%s' a '%s' falló: %s\n"
@@ -1110,22 +1215,22 @@ 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:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error reservando memoria: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: opción obsoleta \"%s\" - no tiene efecto\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "ATENCIÓN: \"%s%s\" es una opción obsoleta - no tiene efecto\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "etiqueta de debug '%s' ignorada\n"
@@ -1433,7 +1538,7 @@ msgstr "opción inválida"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "falta parámetro para la opción \"%.50s\"\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "parámetro incorrecto para la opción \"%.50s\"\n"
@@ -1463,17 +1568,17 @@ msgstr "la orden \"%.50s\" es ambigua\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "opción inválida \"%.50s\"\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predeterminado '%s'\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "fichero de opciones '%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1493,41 +1598,41 @@ msgstr "iconv_open falló: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "la conversión de '%s' a '%s' falló: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "no se pudo crear el fichero temporal '%s': %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "error escribiendo a '%s': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "borrando fichero de bloqueo residual (creado por %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "esperando al bloqueo (que mantiene %d%s) %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(¿bloqueo mutuo?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "bloqueo '%s' no hecho: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "esperando al bloqueo %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
@@ -1762,23 +1867,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, 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:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1794,8 +1899,8 @@ msgstr "Esta orden solo está disponible en tarjetas versión 2\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1805,120 +1910,120 @@ msgstr "Su elección: "
 msgid "[not set]"
 msgstr "[no establecido]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "no forzado"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: sólo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "URL de donde recuperar la clave pública: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error al leer '%s': %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error al escribir '%s': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: longitud de la cadena de preferencias inválida.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: caracteres inválidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Error: respuesta no válida.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "Huella digital CA: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: formato inválido de huella digital.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, 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:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "¿Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1928,98 +2033,98 @@ 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:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "¿De qué tamaño quiere la clave? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "los tamaños de claves %s deben estar en el rango %u-%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr "Cambiando el atributo de la clave de tarjeta por: "
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 msgid "Signature key\n"
 msgstr "Clave de firmado\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 msgid "Encryption key\n"
 msgstr "Clave de cifrado\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr "Clave de autentificación\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Elección inválida.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error al obtener información de la clave: %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 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:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "¿Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2030,168 +2135,168 @@ msgstr ""
 "   PIN = '%s'     PIN Administrador = '%s'\n"
 "Debería cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Clave de firmado\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificación\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD fallido: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr "¿Continuar? (s/N) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "¿Realmente quiere volver a los valores de fábrica? (escriba \"sí\") "
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error de la configuración KDF: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "salir de este menú"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "ver órdenes de administrador"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 #, 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:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "cambiar huella digital de una CA"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "cambiar estado de la opción forzar firma del PIN"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "menú para cambiar o desbloquear el PIN"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "verificar PIN y listar todos los datos"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "desbloquear PIN usando Código de Reinicio"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr "destruir todas las claves y datos"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr "configurar KDF para autentificación de PIN"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 msgid "change the key attribute"
 msgstr "cambia valores de la clave"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/tarjeta> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "Órdenes sólo de administrador\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten órdenes de administrador\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten órdenes de administrador\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inválida (pruebe \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "no se puede abrir '%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2250,8 +2355,8 @@ msgid "subkey"
 msgstr "subclave"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualización fallida: %s\n"
@@ -2291,24 +2396,24 @@ msgstr "no puede usar un paquete simétrico ESK debido al modo S2K\n"
 msgid "using cipher %s\n"
 msgstr "usando cifrado %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' ya está comprimido\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "ATENCIÓN '%s' es un fichero vacío\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "no se puede usar el cifrado '%s' en modo %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "no puede usar el resumen '%s' en modo %s\n"
@@ -2333,7 +2438,13 @@ msgstr ""
 "ATENCIÓN: la clave %s no es adecuada para la encriptación en modo %s\n"
 "\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2342,41 +2453,41 @@ msgstr ""
 "AVISO: forzar el algoritmo de compresión %s (%d) va en contra\n"
 "de las preferencias del receptor\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzar el cifrado simétrico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "no se puede usar la opción '%s' en modo %s\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCIÓN: mensaje cifrado con una clave débil en el cifrado simétrico.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problema trabajando con un paquete cifrado\n"
@@ -2559,218 +2670,276 @@ msgstr "Clave %s inválida hecha válida mediante --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "parámetros válidos para la opción '%s':\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "crea una firma"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "crea una firma en texto claro"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "cifra sólo con un cifrado simétrico"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "genera un nuevo par de claves en modo rápido"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr "añade una nueva id de usuario en modo rápido"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr "revoca una id de usuario en modo rápido"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr "cambia la fecha de caducidad de modo rápido"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "generación de claves con todas las funcionalidades"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo público"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "firma una clave en modo rápido"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "firma una clave localmente en modo rápido"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "revoca una id de usuario en modo rápido"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "cambia una frase contraseña"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "imprime resúmenes de mensaje"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "ejecutar en modo servidor"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|decide la política TOFU de una clave"
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|usa NOMBRE como clave secreta por defecto"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|cifra para el ususario NOMBRE también"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|establecer alias de email"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "usar estilo OpenPGP estricto"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "no hace ningún cambio"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "preguntar antes de sobreescribir"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the input"
+msgstr "Opciones que controlan la seguridad"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+#, fuzzy
+#| msgid "Options controlling the diagnostic output"
+msgid "Options controlling the output"
+msgstr "Opciones que controlan la salida de diagnósticos"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|USER-ID|cifra para ID-USUARIO"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|volcar salida en FICHERO"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|USER-ID|usa este identificador para firmar o descifrar"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "usa modo de texto canónico"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivel de compresión N (0 desactiva)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "usa modo de texto canónico"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+#, fuzzy
+#| msgid "Options controlling the interactivity and enforcement"
+msgid "Options controlling key import and export"
+msgstr "Opciones que controlan la interactividad y obligación"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|FILE|volcar salida en FICHERO"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|usa MECANISMOS para encontrar claves por emails"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "no hace ningún cambio"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "prohibir todo acceso al dirmngr"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "preguntar antes de sobreescribir"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+#, fuzzy
+#| msgid "Options controlling the configuration"
+msgid "Options controlling key listings"
+msgstr "Opciones que controlan la configuración"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "usar estilo OpenPGP estricto"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "lista claves secretas"
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|cifra para ID-USUARIO"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|usa este identificador para firmar o descifrar"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
 
 # ordenes -> órdenes
 # 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:694 sm/gpgsm.c:368
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2778,7 +2947,7 @@ msgstr ""
 "@\n"
 "(Véase en la página del manual la lista completo de órdenes y opciones)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2798,11 +2967,11 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uso: @GPG@ [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2812,7 +2981,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operación por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2820,73 +2989,73 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Clave pública: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: %s [opciones] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "órdenes incompatibles\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no se encontró el signo = en la definición de grupo '%s'\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal '%s'\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, 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:1630
+#: g10/gpg.c:1656
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: propiedad insegura de la extensión '%s'\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal '%s'\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permisos inseguros de la extensión '%s'\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2894,18 +3063,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuración '%s'\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2913,430 +3082,430 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuración '%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "artículo de configuración desconocido '%s'\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "mostrar foto IDs al listar claves"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "mostrar información de uso de las claves al listarlas"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "mostrar URLS de política al listar firmas"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "mostrar todas las notaciones al listar firmas"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "mostrar notaciones estándar IETF al listar firmas"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "mostrar notaciones personalizadas al listar firmas"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostrar URL del servidor de claves preferido al listar firmas"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "mostrar validez de la ID de usuario al listar claves"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostrar subclaves revocadas y expiradas al listar claves"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "mostrar nombre de los anillos de claves al listar claves"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "mostrar fechas de caducidad al listar firmas"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "política TOFU desconocida '%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(usa \"ayuda\" para listar las opciones)\n"
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s no es para uso normal!\n"
 
-#: g10/gpg.c:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, 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:3086
+#: g10/gpg.c:3085
 #, 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:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "modo de entrada de pin inválido '%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "origen incorrecto de la consulta '%s'\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, 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:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inválidas\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inválidas\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importación inválidas\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "opciones de importación inválidas\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opción de filtro inválida: %s\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportación inválidas\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "opciones de exportación inválidas\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inválida\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "lista de opciones inválida\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "mostrar foto IDs al verificar firmas"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "mostrar URLs de política al verificar firmas"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "mostrar todas las notaciones al verificar firmas"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "mostrar notaciones estándar IETF al verificar firmas"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "mostrar notaciones personalizadas al verificar firmas"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "mostrar validez del ID de usuario al verificar firmas"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr "mostrar solo ID primario de usuario al verificar firmas"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "validar firmas con datos PKA"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "aumentar confianza en las firmas con datos válidos PKA"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificación inválidas\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opciones de verificación inválidas\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, 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:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localización de claves inválida\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, 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:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s no permitido con %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "AVISO: ejecutándose con hora del sistema falsificada "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inválido\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresión seleccionado es inválido\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, 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:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inválido; debe ser 0, 1, 2, ó 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inválidas\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inválidas\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inválidas\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresión inválidas\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s aún no funciona con %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, 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:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "el cifrado simétrico de '%s' falló: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "envío al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepción del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportación de clave fallida: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "exportación como clave ssh fallida: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "búsqueda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovación al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de distribución inválido '%s'\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error al leer la especificación de clave '%s': %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, 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:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
@@ -3347,22 +3516,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:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de política de certificado inválida\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de política inválida\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es válida\n"
@@ -3375,7 +3544,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escribe información de estado en este descriptor de fichero"
 
@@ -4082,7 +4251,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¿Seguro que todavía quiere firmarlo? (s/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
@@ -4255,8 +4424,8 @@ msgstr "He comprobado esta clave meticulosamente.\n"
 msgid "Really sign? (y/N) "
 msgstr "¿Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -4447,7 +4616,7 @@ msgstr ""
 "locales (lsign), una 't' para firmas fiables (tsign), 'nr' para firmas no\n"
 "revocables (nrsign) o cualquier combinación de ellas (ltsign, tnrsign, etc)\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "La clave está revocada."
 
@@ -4497,7 +4666,7 @@ msgstr "¿Borrar realmente este identificador de usuario? (s/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "¿Realmente cambiar de sitio la clave primaria? (s/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
@@ -4574,164 +4743,164 @@ msgstr "¿Grabar cambios? (s/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "¿Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualización.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "la revocación del identificador de usuario ha fallado: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "la configuración del ID de usuario primario ha fallado: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" no es una huella digital\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr ""
 "\"%s\" no es la huella digital primaria\n"
 "\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Identificador de usuario '%s' no válido : %s\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "No coincide con ningún identificador de usuario."
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "Nada que firmar.\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "No está firmado por usted.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "la comprobación de la firma creada falló: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' no es una fecha de caducidad válida\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" no es una huella digital válida\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subclave \"%s\" no encontrada\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Características: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Notaciones: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "La siguiente clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "caducó: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Esta clave está deshabilitada"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4739,17 +4908,17 @@ msgstr ""
 "Ten en cuenta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicies el programa.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4758,17 +4927,17 @@ msgstr ""
 "AVISO: ningún ID de usuario está marcado como principal. Esta orden puede\n"
 "       causar que se tome como principal por defecto otro ID de usuario.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "AVISO: Tu subclave de cifrado caduca pronto.\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Puede que también quieras cambiar su fecha de caducidad.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4777,72 +4946,72 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. Añadir un ID fotográfico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¿Está seguro de querer añadirla? (s/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta firma inválida? (s/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d firma borrada.\n"
 msgstr[1] "%d firmas borradas.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "No se borró nada\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "inválida"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" compactado: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
 msgstr[1] "ID de usuario \"%s\": %d firmas borradas\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\": ya minimizado\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya limpiado\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4851,41 +5020,41 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. Añadir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No puede añadir un revocador designado a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "¡AVISO: no podrá deshacer la elección de clave como revocador designado!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "¿Está seguro de querer elegir esta clave como revocador designado? (s/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4893,171 +5062,171 @@ msgstr ""
 "¿Está seguro de querer cambiar la fecha de caducidad para multiples "
 "subclaves? (s/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 msgid "Changing usage of a subkey.\n"
 msgstr "Cambiando el uso de una subclave.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 msgid "Changing usage of the primary key.\n"
 msgstr "Cambiando uso de clave primaria.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la subclave de firmado %s ya está certificada en cruz\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "la subclave %s no firma y así no necesita ser certificada en cruz\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Introduzca la notación: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "¿Continuar? (s/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, 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:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ID de usuario con hash %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No existe una subclave con ID de usuario '%s'.\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con índice %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caducó el %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 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:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Crear los certificados de revocación realmente? (s/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, 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:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5520,7 +5689,7 @@ msgstr ""
 "entropía.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
@@ -5589,11 +5758,11 @@ msgstr "anillo público de claves no escribible encontrado: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error al escribir en el anillo público '%s': %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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"
@@ -5601,7 +5770,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5609,7 +5778,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:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5617,23 +5786,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:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "¿Crear de verdad? (s/N) "
 
@@ -5841,265 +6010,265 @@ msgstr "solicitando clave de %s\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: imposible recuperar URI %s: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamaño anormal para una clave de sesión cifrada (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s clave de sesión cifrada\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "frase contraseña generada con algoritmo de resumen desconocido %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave pública es %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave pública: DEK correcta\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado con clave de %u bits %s, ID %s, creada el %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave pública fallido: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "AVISO: se observan varios textos en claro\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contraseña\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contraseña\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCIÓN: la intgridad del mensaje no está protegida\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "no se encontró firma\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificación de la firma\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, 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:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               emisor \"%s\"\n"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ", algoritmo de clave pública "
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, 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:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
@@ -6165,70 +6334,70 @@ msgstr "(error reportado: %s <%s>)\n"
 msgid "(further info: "
 msgstr "(más información: "
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opción obsoleta \"%s\"\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATENCIÓN: \"%s\" es una orden obsoleta - no la use\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 "%s:%u: opción obsoleta \"%s\"en este archivo - sólo tiene efecto en %s\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr ""
 "ATENCIÓN: \"%s%s\" es una opción obsoleta - no tiene efecto excepto en %s\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "este mensaje podría no ser utilizable por %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "opción ambigua '%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "opción desconocida '%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "Una clave pública ECDSA debe estar en un encoding SEC múltiplo de 8 bits\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "algoritmo débil de resumen desconocido '%s'\n"
@@ -6261,24 +6430,24 @@ msgstr "escribiendo en stdout\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "asumiendo que los datos firmados están en '%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave pública %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: clave de sesión cifrada simétricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notación de firmas críticas: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n"
@@ -6702,12 +6871,12 @@ msgstr "desconocido el destinatario predefinido \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "no hay direcciones válidas\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Nota: la clave %s no usa %s\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Nota: clave %s no tiene preferencias para %s\n"
@@ -7146,7 +7315,7 @@ 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!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
@@ -7191,7 +7360,7 @@ msgstr "error intentando encontrar el registro de confianza en '%s': %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "error de lectura '%s': %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronización: %s\n"
@@ -7716,121 +7885,121 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' no es un identificador largo de clave válido\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clave %s: aceptada como clave fiable\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "la clave %s aparece más de una vez en la base de datos de confianza\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "clave %s: clave fiable sin clave pública - omitida\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "clave %s marcada como de confianza absoluta\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petición tipo %d: fallo lectura: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confianza %lu no es del tipo requerido %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 "Puede intentar recrear la base de datos de confianza usando las órdenes:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Si eso no funciona, por favor consulte el manual\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "imposible usar modelo de confianza (%d) - asumiendo el modelo %s\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "usando %s como modelo de confianza\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobación de la base de datos de confianza\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobación de base de datos de confianza el: %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr ""
 "no es necesaria una comprobación de la base de datos de confianza\n"
 "con el modelo de confianza '%s'\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "no es necesario comprobar la base de datos de confianza\n"
 "con el modelo '%s'\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clave pública %s no encontrada: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d clave procesada"
 msgstr[1] "%d claves procesadas"
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, 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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7838,30 +8007,30 @@ msgstr ""
 "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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"
 
@@ -7873,39 +8042,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 ]"
 
@@ -7953,34 +8122,34 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNúmero: %s%%0ATitular: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Intentos disponibles: %d"
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Por favor introduzca PIN de Administrador"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Por favor, introduzca PIN para claves estándar."
 
@@ -8049,7 +8218,7 @@ msgstr "fallo al almacenar la huella digital: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo guardando la fecha de creación: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
@@ -8112,7 +8281,7 @@ msgstr "El PIN para CHV%d es demasiado corto; longitud mínima %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificación CHV%d falló: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "¡la tarjeta está bloqueada permanentemente!\n"
@@ -8257,14 +8426,14 @@ msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, 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:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - ¿tarjeta OpenPGP inválida?\n"
@@ -8280,55 +8449,55 @@ msgstr "||Por favor introduzca su PIN en el teclado del lector"
 msgid "|N|Initial New PIN"
 msgstr "|N|Nuevo PIN Inicial"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "ejecutar en modo multi servidor (primer plano)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|poner el nivel de depurado a NIVEL"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|escribir log en FICHERO"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|conectar el lector al puerto N"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|usa NOMBRE como driver ct-API"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|usa NOMBRE como driver PC/SC"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "no usa el driverd del CCID interno"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|desconectar la tarjeta después de N segundos de inactividad"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "no usar el teclado del lector"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "denegar órdenes de administración de la tarjeta"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "usar input the largo variable para el pinpad"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "denegar órdenes de administración de la tarjeta"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Uso: @SCDAEMON@ [opciones] (-h para ayuda)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8336,21 +8505,27 @@ msgstr ""
 "Sintaxis: scdaemon [opciones] [orden [args]]\n"
 "Demonio de la tarjeta inteligente para @GNUPG@\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "use la opción '--daemon' para ejecutar el programa en segundo plano\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "manejador del descriptor %d iniciado\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "manejador del descriptor %d terminado\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "error obteniendo información sobre uso de la clave: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8408,7 +8583,7 @@ msgstr "buscando al emisor en una localización externa\n"
 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:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "no se ha podido obtener authorityInfoAccess: %s\n"
@@ -8568,7 +8743,7 @@ msgstr "el certificado raíz no está marcado como fiable"
 msgid "checking the trust list failed: %s\n"
 msgstr "la comprobación de la lista de confianza falló: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "cadena de certificados demasiado larga\n"
@@ -8622,7 +8797,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash de %u bits no vale para %u bits de la clave %s\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8633,7 +8808,7 @@ msgstr "memoria desbordada\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(es el algoritmo MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "ninguno"
 
@@ -8668,42 +8843,37 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no se especifica uso de la clave - asumiendo todos los usos\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "error obteniendo información sobre uso de la clave: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "el certificado no debería haberse usado para certificar\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "el certificado no debería haberse usado para firma en respuesta OCSP\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "el certificado no debería haberse usado para cifrar\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "el certificado no debería haberse usado para firmar\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "el certificado no es utilizable para cifrar\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "el certificado no es utilizable para firmar\n"
@@ -8893,6 +9063,11 @@ msgstr "¿Crear un certificado auto-firmado? (s/N)"
 msgid "These parameters are used:\n"
 msgstr "Se usan estos parámetros:\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error al crear fichero temporal: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "Creando ahora certificado auto firmado. "
@@ -8970,87 +9145,103 @@ msgstr "borrado del certificado \"%s\" fallido: %s\n"
 msgid "no valid recipients given\n"
 msgstr "no se dieron receptores válidos\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "lista claves externas"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "lista de cadenas de certificados"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "importa certificado"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "exporta certificado"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "registrar tarjeta inteligente"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "pasar una orden a dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "invocar gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "crea una salida en base-64"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "no usa la terminal en absoluto"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|número de certificados que incluir"
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|tomar política de información de FICHERO"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "asumir entrada en formato PEM"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "asumir entrada en formato base-64"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "asumir entrada en formato binario"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "crea una salida en base-64"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|usa ID-USUARIO como clave secreta por defecto"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|añade este anillo a la lista de anillos"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "recuperar certificados de emisor perdidos"
+
+#: sm/gpgsm.c:354
+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:372
 msgid "never consult a CRL"
 msgstr "nunca consultar una CRL"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "no comprobar CRLs para certificados raíz"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "comprabar validez usando OCSP"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|número de certificados que incluir"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|FILE|tomar política de información de FICHERO"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "no comprobar políticas de certificados"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "recuperar certificados de emisor perdidos"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "no usa la terminal en absoluto"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|FILE|escribir un log en modo servidor en FICHERO"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|usa el algoritmo de cifrado NOMBRE"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FILE|escribir inform de auditoría a FICHERO"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -9060,39 +9251,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:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "asume \"sí\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FILE|añade este anillo a la lista de anillos"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|USER-ID|usa ID-USUARIO como clave secreta por defecto"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|usa este servidor para buscar claves"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|usa el algoritmo de cifrado NOMBRE"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAME|usa algoritmo de resumen de mensaje NOMBRE"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|escribir inform de auditoría a FICHERO"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Uso: @GPGSM@ [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9102,27 +9277,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:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modelo de validación desconocido '%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importando certificados comunes '%s'\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "no puedo firmar usando '%s': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "orden inválida (no hay orden implícita)\n"
@@ -9182,7 +9357,7 @@ msgstr "problema re-buscando el certificado: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "error almacenando parámetros: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Error - "
 
@@ -9217,7 +9392,7 @@ msgstr ""
 "\n"
 "%s%sEstá realmente seguro de querer hacer esto?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9268,23 +9443,23 @@ msgstr "[no hay fecha]"
 msgid "algorithm:"
 msgstr "algoritmo: %s"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr "firma inválida: el resumen del mensaje no coincide con el calculado\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Firma correcta de"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "                alias"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Es una firma cualificada\n"
@@ -10076,118 +10251,141 @@ msgstr "espero la ruta absoluta del archivo\n"
 msgid "looking up '%s'\n"
 msgstr "buscando '%s'\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "listar los contenidos del cache CRL"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|carga CRL de FILE en la cache"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|carga un CRL de una URL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "apaga el dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "descargar la memoria cache"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|FILE|escribir logs en modo servidor en FICHERO"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr "permitir el chequeo online de versiones de software"
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "arrancar sin preguntar a un usuario"
+#: dirmngr/dirmngr.c:218
+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:196
-msgid "force loading of outdated CRLs"
-msgstr "forzar la carga de CRLs caducados"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "permitir el envío de búsquedas OSCP"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
+msgstr "enrutar todo el tráfico a través de Tor"
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
-msgstr "permitir el chequeo online de versiones de software"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "Configuración para servidores de claves"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|usar servidor de claves en URL"
+
+#: dirmngr/dirmngr.c:244
+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:247
+msgid "Configuration for HTTP servers"
+msgstr "Configuración de servidores HTTP"
+
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "inhibir el uso de HTTP"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "inhibir el uso de LDAP"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorar puntos de distribución CRL HTTP"
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
-msgstr "ignorar puntos de distribución CRL LDAP"
-
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "ignorar URLs de servicio contenidas en los certificados OSCP"
-
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirigir todos los pedidos HTTP a URL"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "usar configuración del proxy HTTP del sistema"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuración de servidores LDAP que se usará"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "inhibir el uso de LDAP"
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignorar puntos de distribución CRL LDAP"
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|usar HOST para las consultas LDAP"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "no usar hosts de reserva con --ldap-proxy"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|usa este servidor para buscar claves"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|lee lista de servidores LDAP de FILE"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 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:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|establecer vida máxima de LDAP en N segundos"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "Configuración de OCSP"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "permitir el envío de búsquedas OSCP"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignorar URLs de servicio contenidas en los certificados OSCP"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|usar contestador OSCP en la URL"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|respuesta OCSP firmada por FPR"
 
-#: dirmngr/dirmngr.c:235
-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:240
-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
-msgid "route all network traffic via Tor"
-msgstr "enrutar todo el tráfico a través de Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "forzar la carga de CRLs caducados"
 
 # ordenes -> órdenes
 # 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:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10196,11 +10394,11 @@ msgstr ""
 "@\n"
 "(Véase en la página del manual la lista completa de órdenes y opciones)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Uso: @DIRMNGR@ [opciones] (-h para ayuda)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10208,83 +10406,83 @@ msgstr ""
 "Sintaxis: @DIRMNGR@ [opciones] [orden [argumentos]]\n"
 "Acceso al servidor de claves, CRL y OCSP para @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "los niveles de debug válidos son: %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "uso: %s [opciones] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fallo al intentar descargar CRL desde '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "falló el procesamiento CRL desde '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: línea demasiado larga - omitida\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: se detectó huella digital no válida\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: error de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, 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:1955
+#: dirmngr/dirmngr.c:1949
 #, 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:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 recibido - ninguna acción definida\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM recibido - apagando ...\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM recibido - todavía %d conexiones activas\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "apagado forzado\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT recibido - apagado inmediato\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "señal %d recibida - ninguna acción definida\n"
@@ -10476,93 +10674,93 @@ msgstr "ha fallado el hashing de la respuesta OCSP para '%s': %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "no firmada por un certificado predeterminado de firma OCSP"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 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:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, 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:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no hay un OCSP responder predeterminado\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "usar el contestador OCSP predeterminado '%s'\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "usar OCSP responder '%s'\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, 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:792
 #, 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:793
 msgid "good"
 msgstr "bien"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, 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:846
 #, 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:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "el OCSP respondor ha devuelto un estado demasiado antiguo\n"
@@ -10572,67 +10770,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:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "falta el número de serie en el ID del certificado"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "ha fallado assuan_inquire: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "ha fallado fetch_cert_by_url: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error al enviar datos: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "ha fallado start_cert_fetch: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "ha fallado fetch_next_cert: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "se ha excedido el número de respuestas(max_replies) %d\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "no puedo colocar la estructura de control: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "fallo al reservar el contexto assuan: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "ha fallado la inicialización del servidor: %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problema de aceptación Assuan: %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "ha fallado el procesado Assuan: %s\n"
@@ -10675,7 +10873,7 @@ msgstr "cadena de certificados es buena\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "el certificado no debería haberse usado para firmas CRL\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "silencioso"
 
@@ -10768,170 +10966,23 @@ msgstr "fallo mandando la línea: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "error enviando opciones estándar: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Opciones que controlan la salida de diagnósticos"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Opciones que controlan la configuración"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Opciones útiles para el depurado"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Opciones que controlan la seguridad"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|las claves SSH caducan en N segundos"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|establecer vida máxima de la clave SSH en N segundos"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Opciones que fuerzan una política de frases contraseña"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "no permitir evitar la política de frases contraseña"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|establecer longitud mínima para nuevas frases contraseña en N"
-
-#: tools/gpgconf-comp.c:580
-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"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|FILE|comprobar nuevas frases contraseña con el patrón en FICHERO"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|frase contraseña caduca tras N días"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "no permite reusar antiguas frases contraseña"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|establecer vida máxima de Pinentry en N segundos"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|usa NOMBRE como clave secreta por defecto"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAME|cifra para el ususario NOMBRE también"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|establecer alias de email"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "Configuración para servidores de claves"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL|usar servidor de claves en URL"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "permitir búsquedas PKA (peticiones DNS)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MECHANISMS|usa MECANISMOS para encontrar claves por emails"
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "importa claves desde un servidor de claves"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-#| msgid "list and check key signatures"
-msgid "include the public key in signatures"
-msgstr "lista y comprueba firmas de las claves"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "prohibir todo acceso al dirmngr"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAME|usa la codificación NOMBRE para frases contraseña PKCS#12"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "no comprobar CRLs para certificados raíz"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Opciones que controlan el formato de la salida"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Opciones que controlan la interactividad y obligación"
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr "Opciones que controlan el uso de Tor"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "Configuración de servidores HTTP"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "usar configuración del proxy HTTP del sistema"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "Configuración de servidores LDAP que se usará"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "lista de servidores LDAP"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "Configuración de OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr "Claves privados"
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr "Smartcards"
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr "Red"
 
@@ -10944,114 +10995,114 @@ 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:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr "Frase contraseña"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "Componente no adecuando para lanzamiento"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, 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:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Verificación externa del componente %s fallida"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Note que las especificación de grupo se ignoran\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error al cerrar '%s'\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error al leer '%s'\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "listar todos los componentes"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "comprobar todos los programas"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|lista de opciones"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|cambiar opciones"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|comprobar opciones"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "aplicar valores globales por defecto"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|actualizar los archivos de configuración usando ARCHIVO"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "obtener directorios de configuración para @GPGCONF@"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "listar fichero de configuración global"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "comprobar fichero global de configuración"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr "consulta la base de datos de versiones de software"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "listar todos los componentes, o uno en particular"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "iniciar un componente en particular"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "matar un componente particular"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "activar cambios en tiempo de ejecución, si es posible"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Uso: @GPGCONF@ [opciones] (-h para ayuda)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11059,15 +11110,15 @@ msgstr ""
 "Sintaxis: @GPGCONF@ [opciones]\n"
 "Administra opciones de configuración de las herramientas GnuPG\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Necesita un argumento de un componente"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Componente no encontrado"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "No se permiten parámetros"
 
@@ -11085,6 +11136,40 @@ msgstr ""
 "Compara frase contraseña dada en entrada estándar con un fichero de "
 "patrones\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "error escribiendo en el fichero temporal: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "usar un fichero log para el servidor"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|FILE|escribir un log en modo servidor en FICHERO"
+
+#~ msgid "run without asking a user"
+#~ msgstr "arrancar sin preguntar a un usuario"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "permitir búsquedas PKA (peticiones DNS)"
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "importa claves desde un servidor de claves"
+
+#, fuzzy
+#~| msgid "list and check key signatures"
+#~ msgid "include the public key in signatures"
+#~ msgstr "lista y comprueba firmas de las claves"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "Opciones que controlan el formato de la salida"
+
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Opciones que controlan el uso de Tor"
+
+#~ msgid "LDAP server list"
+#~ msgstr "lista de servidores LDAP"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "solicitando clave %s de %s servidor %s\n"
 
@@ -11260,9 +11345,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "no se puede abrir %s para escribir: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "error escribiendo en %s: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "error al leer de %s: %s\n"
 
@@ -11426,9 +11508,6 @@ msgstr ""
 #~ msgid "listen() failed: %s\n"
 #~ msgstr "listen() falló: %s\n"
 
-#~ msgid "do not grab keyboard and mouse"
-#~ msgstr "no acaparar teclado y ratón"
-
 #~ msgid "Error: URL too long (limit is %d characters).\n"
 #~ msgstr "Error: URL demasiado larga (el máximo son %d caracteres).\n"
 
@@ -12836,11 +12915,6 @@ msgstr ""
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "nunca usa un MDC para cifrar"
 
-# usa
-# Vale.
-#~ msgid "use the gpg-agent"
-#~ msgstr "usa el agente gpg"
-
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[fichero]|escribe información de estado en el fichero"
 
diff --git a/po/et.po b/po/et.po
index 9c6f7d5..2b5f35a 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -133,8 +133,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr ""
 
@@ -184,13 +184,47 @@ msgstr "halb MPI"
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "muuda parooli"
+
+#: agent/command.c:2423
+#, 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:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -198,189 +232,172 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 msgid "can't create '%s': %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, fuzzy, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "viga parooli loomisel: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "muuda parooli"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Korrake parooli: "
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Korrake parooli: "
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Korrake parooli: "
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "viga parooli loomisel: %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "kirjutan faili `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Sisestage parool\n"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Kasutan seda võtit ikka? "
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, 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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -388,7 +405,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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -396,314 +413,391 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-#, fuzzy
-msgid ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
 msgstr ""
-"@\n"
-"Võtmed:\n"
-" "
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Võti on asendatud"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "ole jutukas"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "ole mõnevõrra vaiksem"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:192
-#, fuzzy
-msgid "use a log file for the server"
-msgstr "otsi võtmeid võtmeserverist"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "ole mõnevõrra vaiksem"
+
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "ei ole toetatud"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "ei ole toetatud"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
 #: agent/gpg-agent.c:244
-msgid "do not use the PIN cache when signing"
+msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:248
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:250
 #, 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:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:258
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:276
 #, fuzzy
-#| msgid "not supported"
-msgid "enable ssh support"
-msgstr "ei ole toetatud"
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|kasuta parooli moodi N"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:278
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "viga parooli loomisel: %s\n"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:283
 #, fuzzy
-#| msgid "not supported"
-msgid "enable putty support"
-msgstr "ei ole toetatud"
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "kasuta gpg-agenti"
+
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: kataloogi ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: jätsin vahele: %s\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Võtmed:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -715,8 +809,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -724,9 +818,8 @@ msgstr ""
 "@Käsud:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -780,43 +873,43 @@ msgstr "Katkesta"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -829,19 +922,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -854,7 +947,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -864,48 +957,48 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muuda parooli"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 msgid "Delete key"
 msgstr "luba võti"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -936,7 +1029,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -954,52 +1047,52 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
@@ -1030,12 +1123,12 @@ msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
@@ -1096,22 +1189,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1451,7 +1544,7 @@ msgstr "vigased impordi võtmed\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "vigased impordi võtmed\n"
@@ -1481,19 +1574,19 @@ msgstr ""
 msgid "invalid option \"%.50s\"\n"
 msgstr "vigased impordi võtmed\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "võtmete fail `%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1513,41 +1606,41 @@ msgstr "faili ei õnnestu avada: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "ei leia avalikku võtit %08lX: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1786,23 +1879,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "pakend: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
@@ -1818,8 +1911,8 @@ msgstr "See käsklus ei ole %s moodis lubatud.\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1829,230 +1922,230 @@ msgstr "Teie valik? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 #, fuzzy
 msgid "not forced"
 msgstr "ei töödeldud"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku võtit pole: %s\n"
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näita sõrmejälge"
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ümardatud üles %u bitini\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, 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:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2060,184 +2153,184 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 #, 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:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "välju sellest menüüst"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "näita seda abiinfot"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 #, fuzzy
 msgid "list all available data"
 msgstr "Võtme leiate: "
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuupäeva"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näita sõrmejälge"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane käsklus (proovige \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "võti --output ei tööta selle käsuga\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "`%s' ei õnnestu avada\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2300,8 +2393,8 @@ msgid "subkey"
 msgstr "Avalik võti: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
@@ -2341,26 +2434,26 @@ msgstr "S2K moodi tõttu ei saa sümmeetrilist ESK paketti kasutada\n"
 msgid "using cipher %s\n"
 msgstr "kasutan Å¡iffrit %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on tühi fail\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "Å¡ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "sõnumilühendi algoritm \"%s\" ei ole moodis %s lubatud\n"
@@ -2383,7 +2476,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2391,40 +2490,40 @@ msgid ""
 msgstr ""
 "pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krüptitud kasutajale: \"%s\"\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krüpteeritud andmed\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "HOIATUS: teade on krüptitud sümmeetrilise šifri nõrga võtmega.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "probleem krüptitud paketi käsitlemisel\n"
@@ -2626,235 +2725,286 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 #, fuzzy
 msgid "make a signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "krüpteeri andmed"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "krüpteerimine kasutades ainult sümmeetrilist šifrit"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "dekrüpteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "näita võtmeid"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "näita võtmeid ja allkirju"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli võtmete allkirju"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "näita võtmeid ja sõrmejälgi"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "näita salajasi võtmeid"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "eemalda võtmed avalike võtmete hoidlast"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "eemalda võtmed salajaste võtmete hoidlast"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "allkirjasta võti"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "allkirjasta võti"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "allkirjasta või toimeta võtit"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "ekspordi võtmed"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "ekspordi võtmed võtmeserverisse"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "impordi võtmed võtmeserverist"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "otsi võtmeid võtmeserverist"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "uuenda võtmeid võtmeserverist"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "impordi/mesti võtmed"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [failid]|trüki teatelühendid"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
-msgid "create ascii armored output"
-msgstr "loo ascii pakendis väljund"
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
+#: g10/gpg.c:596 sm/gpgsm.c:332
 #, fuzzy
-msgid "|USER-ID|encrypt for USER-ID"
+msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|krüpti NIMEle"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "ära tee mingeid muutusi"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "küsi enne ülekirjutamist"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr ""
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr ""
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
+msgid "create ascii armored output"
+msgstr "loo ascii pakendis väljund"
+
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
 #, fuzzy
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "kasuta seda kasutaja IDd"
+msgid "|FILE|write output to FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "kasuta kanoonilist tekstimoodi"
+
+#: g10/gpg.c:743
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|määra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "kasuta kanoonilist tekstimoodi"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr ""
+
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr ""
+
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr ""
+
+#: g10/gpg.c:803 sm/gpgsm.c:324
 #, fuzzy
-msgid "|FILE|write output to FILE"
-msgstr "|FAIL|lae laiendusmoodul FAIL"
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "näita salajasi võtmeid"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "ära tee mingeid muutusi"
+#: g10/gpg.c:805 sm/gpgsm.c:326
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|NIMI|krüpti NIMEle"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "küsi enne ülekirjutamist"
+#: g10/gpg.c:813 sm/gpgsm.c:328
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2862,7 +3012,7 @@ msgstr ""
 "@\n"
 "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2892,13 +3042,13 @@ msgstr ""
 " --list-keys [nimed]        näita võtmeid\n"
 " --fingerprint [nimed]      näita sõrmejälgi\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2913,7 +3063,7 @@ msgstr ""
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2921,551 +3071,551 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Avalik võti: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Å iffer: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Räsi: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "kasuta: gpg [võtmed] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1677
 #, 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:1654
+#: g10/gpg.c:1680
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1660
+#: g10/gpg.c:1686
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1689
 #, 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:1666
+#: g10/gpg.c:1692
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See käsklus ei ole %s moodis lubatud.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s määrab üle %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos mõtet!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud Å¡ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud Å¡ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 või 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 või 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku Å¡ifri eelistused\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku lühendi eelistused\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei tööta veel koos %s-ga\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:4289
+#: g10/gpg.c:4287
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "võtme eksport ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, 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:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage nüüd oma teade ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -3479,7 +3629,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
@@ -4187,7 +4337,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
@@ -4388,8 +4538,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
@@ -4599,7 +4749,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Võti on tühistatud."
 
@@ -4652,7 +4802,7 @@ msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima vähemalt ühe võtme.\n"
@@ -4739,169 +4889,169 @@ msgstr "Salvestan muutused? "
 msgid "Quit without saving? (y/N) "
 msgstr "Väljun salvestamata? "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "vigane väärtus\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Võtmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Teatelühend: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Selle võtme võib olla tühistanud %s võti "
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Selle võtme võib olla tühistanud %s võti "
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[tühistatud] "
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "See võti on blokeeritud"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4909,19 +5059,19 @@ msgstr ""
 "Tuleb tähele panna et kuni te pole programmi uuesti käivitanud, ei pruugi\n"
 "näidatud võtme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "revoked"
 msgstr "[tühistatud] "
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4930,18 +5080,18 @@ msgstr ""
 "HOIATUS: ühtegi kasutaja ID pole märgitud primaarseks.  See käsklus võib\n"
 "              põhjustada muu kasutaja ID primaarseks määramist.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "v3 võtme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4950,35 +5100,35 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis võti. Foto ID lisamine võib sundida mõningaid\n"
 "         PGP versioone seda võtit tagasi lükkama.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4986,38 +5136,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Kustutatud %d allkiri.\n"
 msgstr[1] "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
 msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5026,41 +5176,41 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis võti. Määratud tühistaja lisamine võib\n"
 "         põhjustada mõningaid PGP versioone seda võtit tagasi lükkama.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x-stiili võtmele ei saa määratud tühistajat lisada.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage määratud tühistaja kasutaja ID: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada võtit iseenda määratud tühistajaks\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "HOIATUS: võtme seadmist määratud tühistajaks ei saa tagasi võtta!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5068,181 +5218,181 @@ msgid ""
 msgstr ""
 "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 võtme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Muudan primaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige täpselt üks kasutaja ID.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "jätan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan üle (j/E)? "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   tühistanud %08lX %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute tühistama järgmisi allkirju:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "salajast võtit pole\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5714,7 +5864,7 @@ msgstr ""
 "koguda paremat entroopiat.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
@@ -5783,11 +5933,11 @@ msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5797,35 +5947,35 @@ msgstr ""
 "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
 "kasutades võtit \"--edit-key\".\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, 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:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, 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:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon tõesti? "
@@ -6042,266 +6192,266 @@ msgstr "küsin võtit %08lX võtmeserverist %s\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "veider suurus krüptitud sessiooni võtme jaoks (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s krüpteeritud sessiooni võti\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik võti on %08lX\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku võtmega krüpteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krüpteeritud %u-bitise %s võtmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krüpteeritud %s võtmega, ID %08lX\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku võtmega lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krüpteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krüpteeritud ühe parooliga\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s krüpteeritud andmeid\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate kooskõlalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "lahtikrüpteerimine õnnestus\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: krüpteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll jäeti ära\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei õnnestu töödelda\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Võtme leiate: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "tundmatu avaliku võtme algoritm"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
@@ -6370,68 +6520,68 @@ msgstr "viga lugemisel: %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav võti \"%s\"\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "loen võtmeid failist `%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "tundmatu allkirja klass"
@@ -6467,25 +6617,25 @@ msgstr "kirjutan standardväljundisse\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "HOIATUS: tõenäoliselt ebaturvaline sümmeetriliselt krüpteeritud sessiooni "
 "võti\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kriitiline allkirja noteerimine: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
@@ -6906,12 +7056,12 @@ msgstr "tundmatu vaikimisi saaja `%s'\n"
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
@@ -7341,7 +7491,7 @@ msgstr ""
 "jätsin `%s' vahele: see on PGP genereeritud ElGamal võti,\n"
 "mis ei ole allkirjades kasutamiseks turvaline!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
@@ -7389,7 +7539,7 @@ msgstr "viga usalduse kirje otsimisel: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "viga lugemisel: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync ebaõnnestus: %s\n"
@@ -7898,99 +8048,99 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' ei ole kehtiv pikk võtmeID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "võti %08lX: aktsepteerin usaldusväärse võtmena\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "võti %08lX esineb trustdb failis enam kui korra\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "võti %08lX: usaldataval võtmel pole avalikku võtit - jätsin vahele\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "võti on märgitud abslouutselt usaldatuks.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "usalduse kirje %lu, päringu tüüp %d: lugemine ebaõnnestus: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "usalduse kirje %lu ei oma soovitud tüüpi %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb järgmine kontroll %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ei leia avalikku võtit %08lX: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, 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:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -7998,45 +8148,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid võtmeid pole\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 ""
 
@@ -8048,43 +8198,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 ""
 
@@ -8132,35 +8282,35 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 #, 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuda parooli"
@@ -8228,7 +8378,7 @@ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
@@ -8293,7 +8443,7 @@ msgstr ""
 msgid "verify CHV%d failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
@@ -8439,13 +8589,13 @@ msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -8462,81 +8612,87 @@ msgstr "muuda parooli"
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "ära kasuta terminali"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:179
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "vastuolulised käsud\n"
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
-msgstr ""
-
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8595,7 +8751,7 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8761,7 +8917,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -8815,7 +8971,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -8826,7 +8982,7 @@ msgstr "ei töödeldud"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 #, fuzzy
 msgid "none"
 msgstr "ei"
@@ -8862,42 +9018,37 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s võti, ID %08lX, loodud %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, fuzzy, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
@@ -9091,6 +9242,11 @@ msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9169,134 +9325,134 @@ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 #, fuzzy
 msgid "list external keys"
 msgstr "näita salajasi võtmeid"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 #, fuzzy
 msgid "list certificate chain"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "import certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 #, fuzzy
 msgid "export certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:258
-#, fuzzy
-msgid "create base-64 encoded output"
-msgstr "loo ascii pakendis väljund"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "ära kasuta terminali"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:278
-msgid "never consult a CRL"
-msgstr ""
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "loo ascii pakendis väljund"
 
-#: sm/gpgsm.c:288
-msgid "check validity using OCSP"
-msgstr ""
+#: sm/gpgsm.c:330
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr ""
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
 
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:299
-msgid "do not check certificate policies"
+#: sm/gpgsm.c:354
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NIMI|kasuta paroolidega Å¡ifri algoritmi NIMI"
+
+#: sm/gpgsm.c:372
+msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "ära kasuta terminali"
+#: sm/gpgsm.c:380
+msgid "check validity using OCSP"
+msgstr ""
 
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:382
+msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
-#, fuzzy
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FAIL|lae laiendusmoodul FAIL"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NIMI|kasuta Å¡ifri algoritmi NIMI"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
+
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "pakettmood: ära küsi kunagi"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "eelda enamus küsimustele jah vastust"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "eelda enamus küsimustele ei vastust"
 
-#: sm/gpgsm.c:329
+#: sm/gpgsm.c:418
 #, fuzzy
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
-
-#: sm/gpgsm.c:332
-#, fuzzy
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-#, fuzzy
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|HOST|kasuta seda võtmeserverit"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NIMI|kasuta Å¡ifri algoritmi NIMI"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9307,27 +9463,27 @@ msgstr ""
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9387,7 +9543,7 @@ msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr ""
 
@@ -9417,7 +9573,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9462,23 +9618,23 @@ msgstr ""
 msgid "algorithm:"
 msgstr "pakend: %s\n"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "                 ka \""
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -10275,116 +10431,140 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-msgid "run without asking a user"
-msgstr "Väljun salvestamata? "
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:242
+#, fuzzy
+msgid "|URL|use keyserver at URL"
+msgstr "ei saa parsida võtmeserveri URI\n"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|HOST|kasuta seda võtmeserverit"
+
+#: dirmngr/dirmngr.c:271
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:227
-#, fuzzy
-msgid "|URL|use OCSP responder at URL"
-msgstr "ei saa parsida võtmeserveri URI\n"
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr ""
 
-#: dirmngr/dirmngr.c:229
-msgid "|FPR|OCSP response signed by FPR"
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+#: dirmngr/dirmngr.c:285
+#, fuzzy
+msgid "|URL|use OCSP responder at URL"
+msgstr "ei saa parsida võtmeserveri URI\n"
+
+#: dirmngr/dirmngr.c:287
+msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10397,95 +10577,95 @@ msgstr ""
 "@\n"
 "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "kasuta: gpg [võtmed] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "viga lugemisel: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ei töödeldud"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -10678,93 +10858,93 @@ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 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:540 dirmngr/ocsp.c:727
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 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:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, 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:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10774,68 +10954,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10881,7 +11061,7 @@ msgstr "eelistus %c%lu on duplikaat\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 #, fuzzy
 msgid "quiet"
 msgstr "välju"
@@ -10975,308 +11155,157 @@ msgstr "allkirjastamine ebaõnnestus: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr ""
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr ""
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr ""
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-
-#: tools/gpgconf-comp.c:588
-#, fuzzy
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|kasuta parooli moodi N"
-
-#: tools/gpgconf-comp.c:592
-#, fuzzy
-msgid "do not allow the reuse of old passphrases"
-msgstr "viga parooli loomisel: %s\n"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-#, fuzzy
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NIMI|krüpti NIMEle"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-#, fuzzy
-msgid "|URL|use keyserver at URL"
-msgstr "ei saa parsida võtmeserveri URI\n"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "impordi võtmed võtmeserverist"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-msgid "include the public key in signatures"
-msgstr "kontrolli võtmete allkirju"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr ""
-
-#: tools/gpgconf-comp.c:838
-#, fuzzy
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NIMI|kasuta paroolidega Å¡ifri algoritmi NIMI"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr ""
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr ""
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "võrgu viga"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "halb parool"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "ei leia avalikku võtit"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "list global configuration file"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 #, fuzzy
 msgid "check global configuration file"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "kasuta väljundfailina"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 #, fuzzy
 msgid "Component not found"
 msgstr "ei leia avalikku võtit"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjutan salajase võtme faili `%s'\n"
@@ -11293,6 +11322,27 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "kirjutan faili `%s'\n"
+
+#, fuzzy
+#~ msgid "use a log file for the server"
+#~ msgstr "otsi võtmeid võtmeserverist"
+
+#, fuzzy
+#~ msgid "run without asking a user"
+#~ msgstr "Väljun salvestamata? "
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "impordi võtmed võtmeserverist"
+
+#, fuzzy
+#~ msgid "include the public key in signatures"
+#~ msgstr "kontrolli võtmete allkirju"
+
+#, fuzzy
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
@@ -11432,10 +11482,6 @@ msgstr ""
 #~ msgstr "%s ei õnnestu avada: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
-
-#, fuzzy
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "viga `%s' lugemisel: %s\n"
 
@@ -13137,9 +13183,6 @@ msgstr ""
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "krüptimisel ära kasuta kunagi MDC"
 
-#~ msgid "use the gpg-agent"
-#~ msgstr "kasuta gpg-agenti"
-
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[fail]|kirjuta olekuinfo faili"
 
diff --git a/po/fi.po b/po/fi.po
index 3c852e6..6a4895a 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -149,8 +149,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr ""
 
@@ -200,13 +200,47 @@ msgstr "MPI ei kelpaa"
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "muuta salasanaa"
+
+#: agent/command.c:2423
+#, 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:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -214,189 +248,172 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 msgid "can't create '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, fuzzy, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "muuta salasanaa"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Toista salasana: "
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Toista salasana: "
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Toista salasana: "
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+msgid "error writing to pipe: %s\n"
+msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Syötä salasana\n"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, 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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -404,7 +421,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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -412,315 +429,392 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: agent/genkey.c:653
+#: agent/genkey.c:639
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-#, fuzzy
-msgid ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
 msgstr ""
-"@\n"
-"Valitsimet:\n"
-" "
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Avain on uusittu"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "monisanainen"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "ole jonkinverran hiljaisempi"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:192
-#, fuzzy
-msgid "use a log file for the server"
-msgstr "etsi avaimia avainpalvelimelta"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "monisanainen"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "ole jonkinverran hiljaisempi"
+
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "ei tuettu"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "ei tuettu"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
 #: agent/gpg-agent.c:244
-msgid "do not use the PIN cache when signing"
+msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:248
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:250
 #, 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:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:258
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:276
 #, fuzzy
-#| msgid "not supported"
-msgid "enable ssh support"
-msgstr "ei tuettu"
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|käytä salasanoissa toimintatapaa N"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:278
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:283
 #, fuzzy
-#| msgid "not supported"
-msgid "enable putty support"
-msgstr "ei tuettu"
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "käytä gpg-agentia"
+
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Valitsimet:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -732,8 +826,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -741,9 +835,8 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -797,43 +890,43 @@ msgstr "Peru"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "lukuvirhe: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "lukuvirhe: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -846,19 +939,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -871,7 +964,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -881,48 +974,48 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 msgid "Delete key"
 msgstr "ota avain käyttöön"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -953,7 +1046,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -971,52 +1064,52 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
@@ -1047,12 +1140,12 @@ msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
@@ -1113,22 +1206,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1468,7 +1561,7 @@ msgstr "virheelliset tuontivalitsimet\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "virheelliset tuontivalitsimet\n"
@@ -1498,19 +1591,19 @@ msgstr ""
 msgid "invalid option \"%.50s\"\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1530,41 +1623,41 @@ msgstr "ei voi avata tiedostoa: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1805,23 +1898,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, 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:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
@@ -1837,8 +1930,8 @@ msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1848,230 +1941,230 @@ msgstr "Valintasi? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2079,184 +2172,184 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2319,8 +2412,8 @@ msgid "subkey"
 msgstr "JulkAvain: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
@@ -2360,26 +2453,26 @@ msgstr "symmetristä ESK-pakettia ei voi käyttää S2K-tilan vuoksi\n"
 msgid "using cipher %s\n"
 msgstr "käytetään salakirjoitusalgoritmia %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
@@ -2401,40 +2494,46 @@ msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2442,7 +2541,7 @@ msgstr ""
 "VAROITUS: viesti salattiin symmetrisessä salaimessa \n"
 "esiintyvällä heikolla avaimella.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "ongelma käsiteltäessä salattua pakettia\n"
@@ -2641,235 +2740,286 @@ 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:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 #, fuzzy
 msgid "make a signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
-msgid "create ascii armored output"
-msgstr "tuota ascii-koodattu tuloste"
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
+#: g10/gpg.c:596 sm/gpgsm.c:332
 #, fuzzy
-msgid "|USER-ID|encrypt for USER-ID"
+msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "älä tee muutoksia"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "kysy ennen ylikirjoittamista"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr ""
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr ""
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
+msgid "create ascii armored output"
+msgstr "tuota ascii-koodattu tuloste"
+
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
 #, fuzzy
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
+msgid "|FILE|write output to FILE"
+msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "käytä tekstimuotoa"
+
+#: g10/gpg.c:743
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "käytä tekstimuotoa"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr ""
+
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr ""
+
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr ""
+
+#: g10/gpg.c:803 sm/gpgsm.c:324
 #, fuzzy
-msgid "|FILE|write output to FILE"
-msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "älä tee muutoksia"
+#: g10/gpg.c:805 sm/gpgsm.c:326
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "kysy ennen ylikirjoittamista"
+#: g10/gpg.c:813 sm/gpgsm.c:328
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2878,7 +3028,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2907,13 +3057,13 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2928,7 +3078,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2936,552 +3086,552 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, 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:1630
+#: g10/gpg.c:1656
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, 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:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, 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:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, 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:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, 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:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, 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:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -3495,7 +3645,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
@@ -4207,7 +4357,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
@@ -4409,8 +4559,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -4620,7 +4770,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
@@ -4673,7 +4823,7 @@ msgstr "Varmastiko poista tämä käyttäjätunnus? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
@@ -4760,169 +4910,169 @@ msgstr "Tallenna muutokset? "
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Käyttäjätunnusta ei löydy.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   %08lX allekirjoitti tämän %s%s\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4930,19 +5080,19 @@ msgstr ""
 "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4951,18 +5101,18 @@ msgstr ""
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4971,35 +5121,35 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5007,38 +5157,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d allekirjoitus poistettu.\n"
 msgstr[1] "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
 msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5048,41 +5198,41 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5090,183 +5240,183 @@ msgid ""
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, 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:5784
+#: g10/keyedit.c:5840
 #, 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:5806
+#: g10/keyedit.c:5862
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, 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:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, 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:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, 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:6414
+#: g10/keyedit.c:6470
 #, 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:6511
+#: g10/keyedit.c:6567
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5742,7 +5892,7 @@ msgstr ""
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
@@ -5811,11 +5961,11 @@ msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5824,7 +5974,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5832,7 +5982,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5840,23 +5990,23 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
@@ -6073,260 +6223,260 @@ msgstr "pyydetään avainta %08lX kohteesta %s\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-salattu istuntoavain\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, 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:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "tuntematon julkisen avaimen algoritmi"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6334,12 +6484,12 @@ msgstr ""
 "VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
 "tarkistaa.\n"
 
-#: g10/mainproc.c:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
@@ -6411,68 +6561,68 @@ msgstr "lukuvirhe: %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s ei kenties voi käsitellä tätä viestiä\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
@@ -6508,23 +6658,23 @@ msgstr "kirjoitetaan vakiotulosteeseen\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "data kohteessa \"%s\" oletetaan allekirjoitetuksi\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kriittinen allekirjoitusnotaatio: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
@@ -6955,12 +7105,12 @@ msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "ei kelvollisia vastaanottajia\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@ -7400,7 +7550,7 @@ msgstr ""
 "ohitetaan \"%s\": tämä on PGP:n luoma ElGamal-avain, jolla ei voi "
 "allekirjoittaa turvallisesti!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -7448,7 +7598,7 @@ msgstr "virhe etsittäessä luottamustietuetta: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "lukuvirhe: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronointi epäonnistui: %s\n"
@@ -7957,100 +8107,100 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "\"%s\" ei kelpaa pitkänä avaintunnuksena\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "avain %08lX: hyväksytty luotettuna avaimena\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "avain %08lX esiintyy trustdb:ssä useammin kuin kerran\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "avain %08lX: luotetulle avaimelle ei löydy julkista avainta - ohitetaan\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Avain on määritelty ehdottoman luotettavaksi.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "luottamustietue %lu, pyyntötyyppi %d: luku epäonnistui: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, 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:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8058,45 +8208,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 ""
 
@@ -8108,43 +8258,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 ""
 
@@ -8192,35 +8342,35 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 #, 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuta salasanaa"
@@ -8288,7 +8438,7 @@ msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
@@ -8353,7 +8503,7 @@ msgstr ""
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
@@ -8500,13 +8650,13 @@ msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -8523,81 +8673,87 @@ msgstr "muuta salasanaa"
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "älä käytä lainkaan päätettä"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:179
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "ristiriitainen komento\n"
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
-msgstr ""
-
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8656,7 +8812,7 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8822,7 +8978,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -8876,7 +9032,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -8887,7 +9043,7 @@ msgstr "ei käsitelty"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 #, fuzzy
 msgid "none"
 msgstr "ei"
@@ -8923,42 +9079,37 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, fuzzy, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
@@ -9152,6 +9303,11 @@ msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9230,134 +9386,134 @@ msgstr "avainlohkojen poisto epäonnistui: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 #, fuzzy
 msgid "list external keys"
 msgstr "näytä salaiset avaimet"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 #, fuzzy
 msgid "list certificate chain"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "import certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 #, fuzzy
 msgid "export certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:258
-#, fuzzy
-msgid "create base-64 encoded output"
-msgstr "tuota ascii-koodattu tuloste"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "älä käytä lainkaan päätettä"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:278
-msgid "never consult a CRL"
-msgstr ""
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "tuota ascii-koodattu tuloste"
 
-#: sm/gpgsm.c:288
-msgid "check validity using OCSP"
-msgstr ""
+#: sm/gpgsm.c:330
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr ""
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:299
-msgid "do not check certificate policies"
+#: sm/gpgsm.c:354
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
+
+#: sm/gpgsm.c:372
+msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "älä käytä lainkaan päätettä"
+#: sm/gpgsm.c:380
+msgid "check validity using OCSP"
+msgstr ""
 
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:382
+msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
-#, fuzzy
-msgid "|FILE|write an audit log to FILE"
-msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NIMI|käytä salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
+
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "eräajo: älä kysy mitään"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:329
+#: sm/gpgsm.c:418
 #, fuzzy
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
-
-#: sm/gpgsm.c:332
-#, fuzzy
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-#, fuzzy
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NIMI|käytä salausalgoritmia NIMI"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
+msgid "|FILE|write an audit log to FILE"
+msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9368,27 +9524,27 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9448,7 +9604,7 @@ msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr ""
 
@@ -9478,7 +9634,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9523,23 +9679,23 @@ msgstr ""
 msgid "algorithm:"
 msgstr "ascii-koodaus: %s\n"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "                aka \""
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -10338,116 +10494,140 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-msgid "run without asking a user"
-msgstr "Lopeta tallentamatta muutoksia?"
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:242
+#, fuzzy
+msgid "|URL|use keyserver at URL"
+msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
+
+#: dirmngr/dirmngr.c:271
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:227
-#, fuzzy
-msgid "|URL|use OCSP responder at URL"
-msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr ""
 
-#: dirmngr/dirmngr.c:229
-msgid "|FPR|OCSP response signed by FPR"
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+#: dirmngr/dirmngr.c:285
+#, fuzzy
+msgid "|URL|use OCSP responder at URL"
+msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
+
+#: dirmngr/dirmngr.c:287
+msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10461,95 +10641,95 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "lukuvirhe: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ei käsitelty"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -10742,93 +10922,93 @@ msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 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:540 dirmngr/ocsp.c:727
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 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:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "luo mitätöintivarmenne"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, 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:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10838,68 +11018,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10945,7 +11125,7 @@ msgstr "valinta %c%lu on kopio\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 #, fuzzy
 msgid "quiet"
 msgstr "lopeta|sulje"
@@ -11039,308 +11219,157 @@ msgstr "allekirjoitus epäonnistui: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr ""
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr ""
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr ""
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-
-#: tools/gpgconf-comp.c:588
-#, fuzzy
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|käytä salasanoissa toimintatapaa N"
-
-#: tools/gpgconf-comp.c:592
-#, fuzzy
-msgid "do not allow the reuse of old passphrases"
-msgstr "virhe luotaessa salasanaa: %s\n"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-#, fuzzy
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NIMI|salaa vastaanottajalle NIMI"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-#, fuzzy
-msgid "|URL|use keyserver at URL"
-msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "nouda avaimia avainpalvelimelta"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-msgid "include the public key in signatures"
-msgstr "tarkista avainten allekirjoitukset"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr ""
-
-#: tools/gpgconf-comp.c:838
-#, fuzzy
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr ""
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr ""
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "verkkovirhe"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "väärä salasana"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "julkista avainta ei löydy"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "list global configuration file"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 #, fuzzy
 msgid "check global configuration file"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "päivitä luottamustietokanta"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 #, fuzzy
 msgid "Component not found"
 msgstr "julkista avainta ei löydy"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@ -11357,6 +11386,27 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+
+#, fuzzy
+#~ msgid "use a log file for the server"
+#~ msgstr "etsi avaimia avainpalvelimelta"
+
+#, fuzzy
+#~ msgid "run without asking a user"
+#~ msgstr "Lopeta tallentamatta muutoksia?"
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "nouda avaimia avainpalvelimelta"
+
+#, fuzzy
+#~ msgid "include the public key in signatures"
+#~ msgstr "tarkista avainten allekirjoitukset"
+
+#, fuzzy
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
@@ -11496,10 +11546,6 @@ msgstr ""
 #~ msgstr "tiedostoa %s ei voi avata: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
-
-#, fuzzy
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
@@ -13241,9 +13287,6 @@ msgstr ""
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "älä koskaan käytä MDC:tä salaamiseen"
 
-#~ msgid "use the gpg-agent"
-#~ msgstr "käytä gpg-agentia"
-
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[tiedosto]|kirjoita tilatiedot tiedostoon"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 2288f68..ba6a063 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index fa31417..54679ca 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+0200\n"
 "PO-Revision-Date: 2021-05-19 00:01+0200\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -153,8 +153,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "Phrase secrète :"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "ne correspond pas — veuillez réessayer"
 
@@ -199,63 +199,94 @@ msgstr "Mauvais code personnel"
 msgid "Bad Passphrase"
 msgstr "Mauvaise phrase secrète"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, 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:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Veuillez répéter cette phrase secrète"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase to protect the imported object within the "
+#| "GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Veuillez entrer la phrase secrète pour protéger l'objet importé dans le "
+"système GnuPG."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "impossible de créer « %s » : %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "impossible d'ouvrir « %s » : %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, 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-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "carte détectée avec le numéro de série : %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "aucune clef d'authentification pour SSH sur la carte : %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "aucune clef de carte convenable n'a été trouvée : %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "erreur de lecture des options stockées : %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -264,24 +295,20 @@ msgstr ""
 "Un processus SSH demande à utiliser la clef%%0A  %s%%0A  (%s)%%0AVoulez-vous "
 "l'autoriser ?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "Autoriser"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "Refuser"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Veuillez entrer la phrase secrète pour la clef SSH%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Veuillez répéter cette phrase secrète"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -290,93 +317,89 @@ msgstr ""
 "Veuillez entrer une phrase secrète pour protéger la clef secrète%%0A   %s"
 "%%0A   %s%%0Areçue dans l'espace de stockage de clefs de gpg-agent"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "échec de création du flux à partir de cette socket : %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "Veuillez insérer la carte de numéro de série"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "Veuillez retirer la carte présente et insérer celle de numéro de série"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "Code personnel d'administration"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "CDP"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Code de réinitialisation"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0AUtilisez le pavé numérique du lecteur en entrée."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Répétez ce code de réinitialisation"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "Répétez ce code de déblocage personnel"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Répétez ce code personnel"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr ""
 "les codes de réinitialisation ne correspondent pas ; veuillez réessayer"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr ""
 "les codes de déblocage personnels ne correspondent pas ; veuillez réessayer"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "Les codes personnels ne correspondent pas ; veuillez réessayer"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Veuillez entrer le code personnel%s%s%s pour déverrouiller la carte"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erreur de création du fichier temporaire : %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "erreur d'écriture du fichier temporaire : %s\n"
+#: agent/genkey.c:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "erreur d'écriture sur %s : %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Entrez la nouvelle phrase secrète"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "La prendre quand même"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@ -384,7 +407,7 @@ msgstr ""
 "Aucune phrase secrète n'a été entrée.%0AUne phrase secrète vide n'est pas "
 "autorisée."
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -393,18 +416,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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Oui, aucune protection n'est nécessaire"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, 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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -416,7 +439,7 @@ msgstr[1] ""
 "Une phrase secrète devrait contenir au moins %u chiffres%%0Aou caractères "
 "spéciaux."
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, 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."
@@ -424,161 +447,239 @@ msgstr ""
 "Une phrase secrète ne devrait ni être un mot commun,%%0Ani correspondre à un "
 "certain schéma."
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 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:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Veuillez entrer la nouvelle phrase secrète"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Options :\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+#, fuzzy
+#| msgid "Options useful for debugging"
+msgid "Options used for startup"
+msgstr "Options pratiques pour le débogage"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "exécuter en mode démon (arrière-plan)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "exécuter en mode serveur (premier plan)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "exécuter en mode serveur"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "bavard"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "devenir beaucoup plus silencieux"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "ne pas détacher de la console"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "sortie de commandes à la sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "sortie de commandes à la csh"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|FICHIER|lire les options depuis le FICHIER"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "ne pas détacher de la console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Options contrôlant la sortie de diagnostique"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "utiliser un fichier journal pour le serveur"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "bavard"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PROG|utiliser PROG pour entrer le code personnel"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PROG|utiliser PROG comme SCdaemon"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Options contrôlant la configuration"
+
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "ne pas utiliser le SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PROG|utiliser PROG comme SCdaemon"
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorer les demandes de modification du TTY"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorer les demandes de modification d'aff. X"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "activer la prise en charge de SSH"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "activer la prise en charge de putty"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Options contrôlant la sécurité"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|oublier les codes personnels après N secondes"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|oublier les clefs SSH après N secondes"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|définir la durée maximale du cache de code personnel à N secondes"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|définir la durée maximale du cache de clef SSH à N secondes"
+
+#: agent/gpg-agent.c:248
 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:250
 #, 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:252
 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:257
 msgid "allow presetting passphrase"
 msgstr "permettre de préconfigurer la phrase secrète"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Options d'application d'une politique de phrase secrète"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "pas de contournement de politique de phrase secrète"
+
+#: agent/gpg-agent.c:267
+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:269
+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:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:272
+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:258
-msgid "enable ssh support"
-msgstr "activer la prise en charge de SSH"
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|la phrase secrète expire après N jours"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:278
+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:281
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the PIN-Entry"
+msgstr "Options contrôlant la sécurité"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "activer la prise en charge de putty"
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+#, 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:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PROG|utiliser PROG pour entrer le code personnel"
+
+#: agent/gpg-agent.c:294
+#, 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:298
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
 
 # @EMAIL@ is currently an URL
 #. 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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -586,139 +687,147 @@ msgstr ""
 "Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
 "Gestionnaire de clefs secrètes pour @GNUPG@\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "niveau de débogage « %s » incorrect\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est incorrecte\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "lecture des options de « %s »\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de créer la socket : %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, 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:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erreur de lecture du « nonce » de la socket\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erreur de lien de la socket à « %s » : %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "écoute sur la socket « %s »\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "impossible de créer le répertoire « %s » : %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "répertoire « %s » créé\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "échec de stat() pour « %s » : %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, 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:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, 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:2739
+#: agent/gpg-agent.c:2721
 #, 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:2744
+#: agent/gpg-agent.c:2726
 #, 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:2819
+#: agent/gpg-agent.c:2801
 #, 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:2824
+#: agent/gpg-agent.c:2806
 #, 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:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "échec de npth_pselect : %s — attente 1 s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s arrêté\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 "aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Options :\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
@@ -732,8 +841,8 @@ msgstr ""
 "Syntaxe : gpg-preset-passphrase [options] KEYGRIP\n"
 "Maintenance du cache des mots de passe\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -741,9 +850,8 @@ msgstr ""
 "@Commandes :\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -800,43 +908,43 @@ msgstr "annulé\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erreur de demande de la phrase secrète : %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erreur d'ouverture de « %s » : %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fichier « %s », ligne %d : %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "déclaration « %s » ignorée dans « %s », ligne %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "le système de liste de confiance « %s » n'est pas disponible\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "mauvaise empreinte dans « %s », ligne %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "option de clef incorrecte dans « %s », ligne %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "erreur de lecture de « %s », ligne %d : %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "erreur de lecture de la liste de certificats racine de confiance\n"
@@ -849,7 +957,7 @@ msgstr "erreur de lecture de la liste de certificats racine de confiance\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -858,11 +966,11 @@ msgstr ""
 "Attribuez-vous une confiance ultime%%0A  « %s »%%0Apour certifier "
 "correctement les certificats de l'utilisateur ?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Oui"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "Non"
@@ -875,7 +983,7 @@ msgstr "Non"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -887,22 +995,22 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "Exact"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "Faux"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Remarque : cette phrase secrète n'a jamais été modifiée.%0AVeuillez la "
 "modifier maintenant."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -911,15 +1019,15 @@ msgstr ""
 "Cette phrase secrète n'a pas été modifiée%%0Adepuis le %.4s-%.2s-%.2s. "
 "Veuillez la modifier maintenant."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Modifier la phrase secrète"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "Je la modifierai plus tard"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -927,11 +1035,11 @@ msgid ""
 "%%0A?"
 msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "Supprimer la clef"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -967,7 +1075,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, 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"
@@ -983,53 +1091,53 @@ msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr ""
 "l'algorithme de protection de hachage %d (%s) n'est pas pris en charge\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erreur de création d'un tube : %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "erreur de création d'un flux pour un tube : %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "erreur de création de processus fils : %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "échec d'attente de fin du processus %d : %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "erreur d'exécution de « %s » : il n'est sans doute pas installé\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "erreur d'exécution de « %s » : code de retour %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "erreur d'exécution de « %s » : terminé\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 #| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "échec d'attente de fin du processus %d : %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erreur de lecture du code de retour du processus %d : %s\n"
@@ -1059,13 +1167,13 @@ msgstr "Avertissement : le propriétaire de %s n'est pas sûr « %s »\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Avertissement : les droits de %s ne sont pas sûrs « %s »\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "attente pour permettre à l'agent d'arriver… (%d s)\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "impossible de renommer « %s » en « %s » : %s\n"
@@ -1125,22 +1233,22 @@ 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:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erreur d'allocation de suffisamment de mémoire : %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s : %u : option « %s » obsolète — non prise en compte\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "Attention : « %s%s » est une option obsolète — non prise en compte\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1450,7 +1558,7 @@ msgstr "option incorrecte"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "argument manquant pour l'option « %.50s »\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argument incorrect pour l'option « %.50s »\n"
@@ -1480,17 +1588,17 @@ msgstr "la commande « %.50s » est ambiguë\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "option « %.50s » incorrecte\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "Remarque : pas de fichier d'options par défaut « %s »\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "fichier d'options « %s » : %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1510,41 +1618,41 @@ msgstr "échec de iconv_open : %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "impossible de convertir « %s » en « %s » : %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "impossible de créer le fichier temporaire « %s » : %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "erreur d'écriture sur « %s » : %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "suppression du vieux fichier verrou (créé par %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "attente du verrou (appartenant à %d%s) %s…\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(peut-être un verrou mort) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "verrou « %s » non effectif : %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "attente du verrou %s…\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
@@ -1789,23 +1897,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armure : %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, 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:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1821,8 +1929,8 @@ msgstr "Cette commande n'est disponible que pour les cartes en version 2\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1832,122 +1940,122 @@ msgstr "Quel est votre choix ? "
 msgid "[not set]"
 msgstr "[non positionné]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "non forcé"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "forcé"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 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:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur : le caractère « < » ne peut pas être utilisé.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur : les espaces doubles ne sont pas permises.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Nom du détenteur de la carte : "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Prénom du détenteur de la carte : "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "URL pour récupérer la clef publique : "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "erreur de lecture de « %s » : %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "erreur d'écriture de « %s » : %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Données d'identification (nom du compte) : "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Données DO privées : "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Préférences de langue : "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 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:1111
+#: g10/card-util.c:1120
 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:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Erreur : réponse incorrecte.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorité de certification : "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur : formatage incorrect de l'empreinte.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opération sur la clef impossible : %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Faut-il remplacer la clef existante ? (o/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1957,84 +2065,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:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de clef désirez-vous ? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "les tailles de clefs %s doivent être dans l'intervalle %u-%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Clef de signature\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Clef de chiffrement\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Clef d'authentification\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Sélectionnez le type de clef désiré :\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Choix incorrect.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
@@ -2042,27 +2150,27 @@ msgstr ""
 "erreur de lecture des renseignements actuellement contenus\n"
 "dans la clef : %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 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:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Faut-il remplacer les clefs existantes ? (o/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2073,177 +2181,177 @@ msgstr ""
 "   code personnel = « %s »     code personnel d'admin. = « %s ».\n"
 "Vous devriez les modifier avec la commande --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 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:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Clef de signature\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clef de chiffrement\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clef d'authentification\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "Veuillez sélectionner l'endroit où stocker la clef :\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "échec de KEYTOCARD : %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 #| msgid "Continue? (Y/n) "
 msgid "Continue? (y/N) "
 msgstr "Faut-il continuer ? (O/n) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, 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:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "afficher les commandes d'administration"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "afficher toutes les données disponibles"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "modifier le nom du détenteur de la carte"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "modifier l'URL pour récupérer la clef"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 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:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "modifier l'identifiant de connexion"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "modifier les préférences de langue"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 #, 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:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "modifier une empreinte d'autorité de certification"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 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:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "générer de nouvelles clefs"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour modifier ou déverrouiller le code personnel"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "vérifier le code personnel et afficher toutes les données"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 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:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOM|utiliser le NOM d'utilisateur pour authentif."
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "modifier la confiance du propriétaire"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/carte> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande incorrecte (essayez « help »)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "impossible d'ouvrir « %s »\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clef « %s » introuvable : %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2303,8 +2411,8 @@ msgid "subkey"
 msgstr "sous-clef"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "échec de la mise à jour : %s\n"
@@ -2345,25 +2453,25 @@ msgstr "impossible d'utiliser un paquet ESK symétrique en mode S2K\n"
 msgid "using cipher %s\n"
 msgstr "utilisation de l'algorithme de chiffrement %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "« %s » est déjà compressé\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "Attention : « %s » est un fichier vide\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 #| msgid "you may not use digest algorithm '%s' while in %s mode\n"
 msgid "digest algorithm '%s' may not be used in %s mode\n"
@@ -2388,7 +2496,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "Attention : « %s%s » est une option obsolète — non prise en compte\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2397,35 +2511,35 @@ msgstr ""
 "Attention : forcer l'algorithme de compression %s (%d) est en\n"
 "            désaccord avec les préférences du destinataire\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forcer le chiffrement symétrique %s (%d) est en désaccord\n"
 "avec les préférences du destinataire\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffré pour : « %s »\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "impossible d'utiliser %s en mode %s.\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "données chiffrées avec %s\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffré avec l'algorithme inconnu %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2433,7 +2547,7 @@ msgstr ""
 "Attention : le message a été chiffré avec une clef faible pendant le\n"
 "            chiffrement symétrique.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problème de gestion des paquets chiffrés\n"
@@ -2627,222 +2741,280 @@ msgstr ""
 "utilisation de la sous-clef %s à la place de la clef\n"
 "principale %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "argument incorrect pour l'option « %.50s »\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "faire une signature"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "faire une signature en texte clair"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "faire une signature détachée"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "chiffrer les données"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement symétrique seulement"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "déchiffrer les données (défaut)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "vérifier une signature"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "afficher les clefs"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "afficher les clefs et les signatures"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "afficher et vérifier les signatures de clefs"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "afficher les clefs et les empreintes"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "afficher les clefs secrètes"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "générer une nouvelle paire de clefs"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "générer une paire de clefs complètes"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "supprimer les clefs du porte-clefs public"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "supprimer les clefs du porte-clefs secret"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "signer rapidement une clef"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "signer rapidement une clef localement"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "signer une clef"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "signer une clef localement"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "signer ou éditer une clef"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "modifier une phrase secrète"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "exporter les clefs"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "exporter les clefs vers un serveur de clefs"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importer les clefs d'un serveur de clefs"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "chercher les clefs avec un serveur de clefs"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "mettre à jour les clefs depuis un serveur"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importer ou fusionner les clefs"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "afficher l'état de la carte"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "modifier les données d'une carte"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "modifier le code personnel d'une carte"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "mettre la base de confiance à jour"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "indiquer les fonctions de hachage"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "exécuter en mode serveur"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NOM|chiffrer aussi pour l'identité NOM"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|configurer les alias d'adresse"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "utiliser le comportement strict d'OpenPGP"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "ne rien modifier"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "demander avant d'écraser un fichier"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the input"
+msgstr "Options contrôlant la sécurité"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+#, fuzzy
+#| msgid "Options controlling the diagnostic output"
+msgid "Options controlling the output"
+msgstr "Options contrôlant la sortie de diagnostique"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "créer une sortie ASCII avec armure"
 
-# NOTE: Extra initial space to realign the output (maybe wchar issue)
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|FICHIER|écrire la sortie dans le FICHIER"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "utiliser le mode texte canonique"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+#, fuzzy
+#| msgid "Options controlling the interactivity and enforcement"
+msgid "Options controlling key import and export"
+msgstr "Options contrôlant l'interactivité et la mise en application"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|FICHIER|écrire la sortie dans le FICHIER"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MÉCANISMES|utiliser les MÉCANISMES pour localiser les clefs"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "ne rien modifier"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "désactiver tous les accès au dirmngr"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "demander avant d'écraser un fichier"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+#, fuzzy
+#| msgid "Options controlling the configuration"
+msgid "Options controlling key listings"
+msgstr "Options contrôlant la configuration"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "utiliser le comportement strict d'OpenPGP"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "afficher les clefs secrètes"
+
+# NOTE: Extra initial space to realign the output (maybe wchar issue)
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2851,7 +3023,7 @@ msgstr ""
 "(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
 "et options)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2881,11 +3053,11 @@ msgstr ""
 " --list-keys [noms]         montrer les clefs\n"
 " --fingerprint [noms]       montrer les empreintes\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2895,7 +3067,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:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2903,87 +3075,87 @@ msgstr ""
 "\n"
 "Algorithmes pris en charge :\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Clef publique : "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Chiffrement : "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hachage : "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Compression : "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "utilisation : %s [options] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "aucun signe = trouvé dans la définition du groupe « %s »\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, 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:1627
+#: g10/gpg.c:1653
 #, 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:1630
+#: g10/gpg.c:1656
 #, 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:1636
+#: g10/gpg.c:1662
 #, 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:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, 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:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2991,21 +3163,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:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -3013,467 +3185,467 @@ msgstr ""
 "Attention : les droits du répertoire contenant le fichier de configuration\n"
 "            « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "élément de configuration « %s » inconnu\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "montrer les photos d'identité en affichant les clefs"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "montrer les URL de politique en affichant les signatures"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "montrer toutes les notations en affichant les signatures"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "utiliser les notations aux normes IETF en affichant les signatures"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en affichant les signatures"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "montrer les URL des serveurs de clefs favoris en affichant les signatures"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "indiquer la validité de l'identité en affichant les clefs"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 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:2024
+#: g10/gpg.c:2027
 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:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "montrer le nom du porte-clefs en affichant les clefs"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "montrer les dates d'expiration en affichant les signatures"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "option « %s » inconnue\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas permise en mode %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, 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:3086
+#: g10/gpg.c:3085
 #, 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:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "mode pinentry « %s » incorrect\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, 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:3178
+#: g10/gpg.c:3177
 #, 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:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'analyser l'URL du serveur de clefs\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s : %d : options d'importation incorrectes\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "options d'importation incorrectes\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s : %d : options d'exportation incorrectes\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "options d'exportation incorrectes\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s : %d : options de liste incorrectes\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "montrer les photos d'identité en vérifiant les signatures"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "montrer les URL de politique en vérifiant les signatures"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "montrer toutes les notations en vérifiant les signatures"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 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:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "indiquer la validité de l'identité en vérifiant les signatures"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 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:3287
+#: g10/gpg.c:3286
 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:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "valider les signatures avec les données PKA"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "augmenter la confiance des signatures avec des données PKA valables"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s : %d : options de vérification incorrectes\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "options de vérification incorrectes\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, 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:3517
+#: g10/gpg.c:3511
 #, 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:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "liste de recherche automatique de clef incorrecte\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, 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:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Attention : %s remplace %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s.\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s.\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "Attention : exécution avec un système de temps contrefait : "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression sélectionné est incorrect\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, 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:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "« completes-needed » doit être supérieur à 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "« marginals-needed » doit être supérieur à 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "« min-cert-level » incorrect ; doit être , 1, 2 ou 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Remarque : le mode S2K simple (0) est fortement déconseillé\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K incorrect ; doit être 0, 1 ou 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "préférences par défaut incorrectes\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "préférences personnelles de chiffrement incorrectes\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "préférences personnelles de hachage incorrectes\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "préférences personnelles de compression incorrectes\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne fonctionne pas encore avec %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance : %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "échec du chiffrement symétrique de « %s » : %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "échec d'envoi vers le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "échec de réception depuis le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "échec d'exportation de la clef : %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, 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:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "échec de recherche au sein du serveur de clefs : %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "échec de déconstruction d'une armure : %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "échec de construction d'une armure : %s \n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algorithme de hachage « %s » incorrect\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 #| msgid "error loading certificate '%s': %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "erreur de chargement du certificat « %s » : %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message…\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, 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:5492
+#: g10/gpg.c:5490
 #, 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:5525
+#: g10/gpg.c:5523
 #, 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"
@@ -3486,7 +3658,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
@@ -4207,7 +4379,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voulez-vous vraiment toujours la signer ? (o/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr " Impossible de signer.\n"
 
@@ -4381,8 +4553,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:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "échec de la signature : %s\n"
@@ -4585,7 +4757,7 @@ msgstr ""
 "  confiance (tsign), « nr » pour les signatures non révocables\n"
 "  (nrsign), ou toute combinaison possible (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "La clef est révoquée."
 
@@ -4635,7 +4807,7 @@ msgstr "Faut-il vraiment supprimer cette identité ? (o/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Faut-il vraiment déplacer la clef principale ? (o/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez sélectionner exactement une clef.\n"
 
@@ -4714,169 +4886,169 @@ msgstr "Faut-il enregistrer les modifications ? (o/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Faut-il quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "La clef n'a pas été modifiée donc la mise à jour est inutile.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "échec de vérification de la liste de confiance : %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "échec de vérification de la liste de confiance : %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "« %s » n’est pas une empreinte\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "« %s » n’est pas l’empreinte principale\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valeur incorrecte\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "Pas d’identités correspondantes."
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "Rien à signer.\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Non signée par vous.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "échec de vérification de la signature créée : %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 #| msgid "'%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "« %s » n'est pas une date d'expiration de signature valable\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "« %s » n’est pas une empreinte\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "clef « %s » introuvable : %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Hachage : "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Fonctionnalités : "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Serveur de clefs sans modification"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Serveur de clefs favori : "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Notations : "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Il n'y a pas de préférences dans une identité de type PGP 2.x.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "La clef suivante a été révoquée le %s par la clef %s %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Cette clef peut être révoquée par la clef %s %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "créé : %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "révoquée : %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "expirée : %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "expire : %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation : %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "nº de carte : "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "confiance : %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "validité : %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Cette clef a été désactivée"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4884,17 +5056,17 @@ msgstr ""
 "Veuillez remarquer que la validité affichée pour la clef n'est pas\n"
 "forcément correcte avant d'avoir relancé le programme.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "révoquée"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "expirée"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4904,17 +5076,17 @@ msgstr ""
 "commande\n"
 "            risque de rendre une autre identité principale par défaut.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Vous pourriez modifier aussi sa date d’expiration.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4923,36 +5095,36 @@ msgstr ""
 "Attention : c'est une clef de type PGP 2. Ajouter une photo d'identité\n"
 "            peut forcer certaines versions de PGP à rejeter cette clef.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voulez-vous vraiment toujours l'ajouter ? (o/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Cette identité existe déjà pour cette clef.\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature incorrecte ? (o/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette autosignature ? (o/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4960,20 +5132,20 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d signature supprimée.\n"
 msgstr[1] "%d signature supprimée.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a été supprimé.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "incorrecte"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identité « %s » compactée : %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -4981,17 +5153,17 @@ msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Identité « %s » : %d signature supprimée\n"
 msgstr[1] "Identité « %s » : %d signature supprimée\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identité « %s » : déjà minimisée\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identité « %s » : déjà nettoyée\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5000,46 +5172,46 @@ msgstr ""
 "Attention : c'est une clef de type PGP 2.x. Ajouter un révocateur désigné\n"
 "            peut forcer certaines versions de PGP à rejeter cette clef.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de révocateur désigné à une clef de type PGP 2."
 "x.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez l'identité du révocateur désigné : "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossible d'utiliser une clef de type PGP 2.x comme révocateur désigné.\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "vous ne pouvez pas utiliser une clef comme son propre révocateur désigné\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette clef à déjà été désignée comme un révocateur\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "Attention : l'établissement d'une clef comme révocateur désigné\n"
 "            est irréversible.\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5049,181 +5221,181 @@ msgid ""
 msgstr ""
 "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modification de la date d'expiration d'une sous-clef.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modification de la date d'expiration de la clef principale.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas modifier la date d'expiration d'une clef v3\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Modification de la date d'expiration d'une sous-clef.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Modification de la date d'expiration de la clef principale.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la sous-clef de signature %s a déjà une certification croisée\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "la sous-clef %s ne signe pas et n'a donc pas besoin de certification "
 "croisée\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Veuillez sélectionner exactement une identité.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'autosignature v3 de l'identité « %s » a été ignorée\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de clefs favori : "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voulez-vous vraiment le remplacer ? (o/N) "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voulez-vous vraiment le supprimer ? (o/N) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Entrez la notation : "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Faut-il continuer ? (o/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'identité d'indice %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas d'identité avec le hachage %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, 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:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-clef d'indice %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identité : « %s »\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expiré le %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 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:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (non révocable)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, 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:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous êtes sur le point de révoquer ces signatures :\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Faut-il vraiment créer les certificats de révocation ? (o/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "pas de clef secrète\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'identité « %s »\" est déjà révoquée.\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clef %s est déjà révoqué.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-clef %s est déjà révoquée.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5695,7 +5867,7 @@ msgstr ""
 "nombres aléatoires une meilleure chance d'obtenir suffisamment d'entropie.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Échec de génération de la clef : %s\n"
@@ -5766,11 +5938,11 @@ msgstr "aucun porte-clefs public accessible en écriture n'a été trouvé : %s
 msgid "error writing public keyring '%s': %s\n"
 msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 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:5229
+#: g10/keygen.c:5226
 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"
@@ -5779,7 +5951,7 @@ msgstr ""
 "pouvez\n"
 "utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5787,7 +5959,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:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5795,25 +5967,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:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Faut-il vraiment la créer ? (o/N) "
 
@@ -6033,257 +6205,257 @@ msgstr "requête de la clef sur « %s »\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Attention : impossible de récupérer l'URI %s : %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "taille étonnante pour une clef de session chiffrée (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clef de session chiffrée %s\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "phrase secrète générée avec l'algorithme de hachage %d inconnu\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clef publique est %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, 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:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "chiffré avec une clef %2$s de %1$u bits, identifiant %3$s, créée le %4$s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      « %s »\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffré avec une clef %s, identifiant %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "échec du déchiffrement par clef publique : %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "Attention : plusieurs textes en clair ont été vus\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffré avec %lu phrases secrètes\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffré avec 1 phrase secrète\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "les données sont supposées chiffrées avec %s\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, 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:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "échec du déchiffrement : %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "le déchiffrement a réussi\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Attention : le message chiffré a été manipulé.\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "échec du déchiffrement : %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original : « %.*s »\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "aucune signature trouvée\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de « %s »"
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expirée de « %s »"
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de « %s »"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "vérification de signature supprimée\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, 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:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               avec la clef %s %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                alias « %s »"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Clef disponible sur : "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[doute]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias « %s »"
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expiré le %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "signature %s, algorithme de hachage %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "mode texte"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ", algorithme de clef "
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de vérifier la signature : %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas détachée\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6291,12 +6463,12 @@ msgstr ""
 "Attention : plusieurs signatures ont été détectées.\n"
 "            Seule la première sera vérifiée.\n"
 
-#: g10/mainproc.c:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien type (PGP 2.x)\n"
@@ -6368,34 +6540,34 @@ msgstr "erreur de lecture dans « %s » : %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s : %d : option « %s » déconseillée\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "Attention : « %s » est une option déconseillée\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "veuillez plutôt utiliser « %s%s »\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "Attention : « %s » est une commande déconseillée — ne l'utilisez pas\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 "%s : %u : « %s » est obsolète dans ce fichier — n’est prise en compte que "
 "dans %s\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@ -6403,38 +6575,38 @@ msgstr ""
 "Attention : « %s%s » est une option obsolète — non prise en compte à part "
 "dans %s\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Non compressé"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "non compressé|non|sans"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ce message ne sera pas utilisable par %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "option « %s » ambiguë\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "option « %s » inconnue\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "une clef publique ECDSA est censée être dans un encodage SEC multiple de "
 "8 bits\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 #| msgid "Unknown signature type '%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6468,25 +6640,25 @@ msgstr "écriture vers la sortie standard\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "les données signées sont supposées être dans « %s »\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de gérer l'algorithme à clef publique %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "Attention : la clef de session chiffrée de manière symétrique risque\n"
 "            de ne pas être sécurisée\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notation de signature critique : "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d possède un bit critique\n"
@@ -6929,12 +7101,12 @@ msgstr "destinataire par défaut « %s » inconnu\n"
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valable\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Remarque : la clef %s n'a pas de fonctionnalité %s\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Remarque : la clef %s n'a pas de préférence pour %s\n"
@@ -7412,7 +7584,7 @@ msgstr ""
 "c'est une clef Elgamal générée par PGP qui n'est pas sûre pour les "
 "signatures."
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "enregistrement de confiance %lu, type %d : échec d'écriture : %s\n"
@@ -7457,7 +7629,7 @@ msgstr "impossible de trouver l'enregistrement de confiance dans « %s » : %
 msgid "read error in '%s': %s\n"
 msgstr "erreur de lecture dans « %s » : %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance : échec de synchronisation : %s\n"
@@ -7976,100 +8148,100 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "« %s » n'est pas un identifiant valable de clef longue\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "clef %s : acceptée comme clef de confiance\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "la clef %s apparaît plusieurs fois dans la base de confiance\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "clef %s : pas de clef publique pour la clef de confiance — ignorée\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "clef %s marquée de confiance ultime.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 "enregistrement de confiance %lu, type de requête %d : échec de lecture : %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "l'enregistrement de confiance %lu n'est pas du type %d demandé\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 "Vous pourriez essayer de recréer la base de confiance avec les commandes :\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Si cela ne fonctionne pas, veuillez consulter le mode d'emploi\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "impossible d'utiliser ce modèle de confiance inconnu (%d) —\n"
 "     utilisation du modèle de confiance %s à la place\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "utilisation du modèle de confiance %s\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "inutile de vérifier la base de confiance\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine vérification de la base de confiance aura lieu le %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr ""
 "inutile de vérifier la base de confiance avec le modèle de\n"
 "     confiance « %s »\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "inutile de mettre à jour la base de confiance avec le modèle de\n"
 "     confiance « %s »\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clef publique %s introuvable : %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "veuillez faire un --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "vérification de la base de confiance\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8077,7 +8249,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:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8085,17 +8257,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune clef de confiance ultime n'a été trouvée\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8103,30 +8275,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:2290
+#: g10/trustdb.c:2333
 #, 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"
 
@@ -8138,41 +8310,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 ]"
 
@@ -8222,19 +8394,19 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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 "
@@ -8242,17 +8414,17 @@ 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Veuillez entrer le code personnel d'administration"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Veuillez entrer le code personnel pour les clefs standards."
 
@@ -8325,7 +8497,7 @@ msgstr "impossible de stocker l'empreinte : %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "impossible de stocker la date de création : %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur de récupération de l'état CHV de la carte\n"
@@ -8395,7 +8567,7 @@ msgstr ""
 msgid "verify CHV%d failed: %s\n"
 msgstr "échec de vérification CHV%d : %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "la carte est irrémédiablement bloquée.\n"
@@ -8549,7 +8721,7 @@ msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "signatures créées jusqu'à présent : %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8557,7 +8729,7 @@ msgstr ""
 "la vérification du code personnel d'administration est actuellement\n"
 "interdite avec cette commande\n"
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8575,55 +8747,55 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "|N|Nouveau code personnel initial"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "exécuter en mode multiserveur (premier plan)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVEAU|définir le niveau de débogage à NIVEAU"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|FICHIER|écrire un journal dans le FICHIER"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|se connecter au lecteur par le port N"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOM|utiliser NOM comme pilote ct-API"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOM|utiliser NOM comme pilote PC/SC"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "ne pas utiliser le pilote CCID interne"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|déconnecter la carte après N secondes d'inactivité "
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "ne pas utiliser de pavé numérique du lecteur"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "refus d'utiliser les commandes d'administration de la carte"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "utiliser une entrée de taille variable pour le pavé numérique"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "refus d'utiliser les commandes d'administration de la carte"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Utilisation : @SCDAEMON@ [options] (-h pour l'aide)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8631,23 +8803,29 @@ msgstr ""
 "Syntaxe : scdaemon [options] [commande [arguments]]\n"
 "Démon de carte à puce pour @GNUPG@\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "veuillez utiliser l'option « --daemon » pour exécuter le programme\n"
 "en arrière-plan\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "gestionnaire pour le descripteur %d démarré\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "gestionnaire pour le descripteur %d terminé\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "erreur de lecture des renseignements d'utilisation de clef : %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8706,7 +8884,7 @@ msgstr "recherche d'émetteur à l'extérieur\n"
 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:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "impossible d'obtenir authorityInfoAccess : %s\n"
@@ -8868,7 +9046,7 @@ msgstr "le certificat racine n'est pas marqué de confiance"
 msgid "checking the trust list failed: %s\n"
 msgstr "échec de vérification de la liste de confiance : %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "chaîne de certificats trop longue\n"
@@ -8927,7 +9105,7 @@ msgstr ""
 "un hachage de %1$u bits n'est pas valable pour une clef %3$s de %2$u bits\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8938,7 +9116,7 @@ msgstr "hors limite\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(c'est l'algorithme MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "aucun"
 
@@ -8974,46 +9152,41 @@ msgstr ""
 "numéro de série %s, identifiant 0x%08lX,\n"
 "créé le %s, expire le %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 "aucune utilisation de clef indiquée — toutes les utilisations sont "
 "supposées\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "erreur de lecture des renseignements d'utilisation de clef : %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "le certificat n'aurait pas dû être utilisé pour la certification\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 "le certificat n'aurait pas dû être utilisé pour la signature de réponse "
 "OCSP\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "le certificat n'aurait pas dû être utilisé pour le chiffrement\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "le certificat n'aurait pas dû être utilisé pour la signature\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "le certificat n'est pas utilisable pour le chiffrement\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "le certificat n'est pas utilisable pour la signature\n"
@@ -9202,6 +9375,11 @@ msgstr "Faut-il créer un certificat autosigné ? (o/N) "
 msgid "These parameters are used:\n"
 msgstr "Ces paramètres seront utilisés :\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erreur de création du fichier temporaire : %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "Création de certificat autosigné. "
@@ -9279,123 +9457,123 @@ msgstr "échec de suppression du certificat « %s » : %s\n"
 msgid "no valid recipients given\n"
 msgstr "aucune destinataire valable donnée\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "afficher les clefs externes"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "afficher la chaîne de certificats"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "importer les certificats"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "exporter les certificats"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "enregistrer une carte à puce"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "passer une commande au dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "appeler gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "créer une sortie encodée en base-64"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "ne pas utiliser du tout le terminal"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|nombre de certificats à inclure"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|FICHIER|prendre renseignements de politique du FICHIER"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "entrée supposée au format PEM"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "entrée supposée au format base-64"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "entrée supposée au format binaire"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "créer une sortie encodée en base-64"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|IDENTITÉ| utiliser IDENTITÉ comme clef secr. par défaut"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FICHIER|ajouter le trousseau à la liste de trousseaux"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "récupérer certificats d'émetteur manquants"
+
+#: sm/gpgsm.c:354
+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:372
 msgid "never consult a CRL"
 msgstr "ne pas consulter liste de révocations de cert."
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "ne pas vérifier les listes de révocations de certificat racine"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "vérifier la validité avec OCSP"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|nombre de certificats à inclure"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|FICHIER|prendre renseignements de politique du FICHIER"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "ne pas vérifier les politiques de certificat"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "récupérer certificats d'émetteur manquants"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "ne pas utiliser du tout le terminal"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|FICHIER|écrire un journal serveur dans le FICHIER"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FICHIER|écrire un journal d'audit dans le FICHIER"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NOM|utiliser l'algorithme de hachage NOM"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "mode automatique : aucune question"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "oui comme réponse à la plupart des questions"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "non comme réponse à la plupart des questions"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FICHIER|ajouter le trousseau à la liste de trousseaux"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|IDENTITÉ| utiliser IDENTITÉ comme clef secr. par défaut"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|utiliser ce serveur pour rechercher les clefs"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOM|utiliser l'algorithme de hachage NOM"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FICHIER|écrire un journal d'audit dans le FICHIER"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Utilisation : @GPGSM@ [options] [fichiers] (-h pour l'aide)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9405,27 +9583,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:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modèle de validation « %s » inconnu\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importation des certificats commun « %s »\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossible de signer en utilisant « %s » : %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "commande incorrecte (il n'y a pas de commande implicite)\n"
@@ -9485,7 +9663,7 @@ msgstr "problème de nouvelle recherche de certificat : %s\n"
 msgid "error storing flags: %s\n"
 msgstr "erreur de stockage des options : %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Erreur — "
 
@@ -9524,7 +9702,7 @@ msgstr ""
 "\n"
 "%s%sVoulez-vous vraiment faire cela ?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9578,7 +9756,7 @@ msgstr "[date non donnée]"
 msgid "algorithm:"
 msgstr "algorithme : %s"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9586,17 +9764,17 @@ msgstr ""
 "signature incorrecte : l'attribut de hachage du message ne correspond pas à "
 "celui calculé\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Bonne signature de"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "                alias"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "C'est une signature qualifiée\n"
@@ -10427,120 +10605,143 @@ msgstr "nom de fichier absolu attendu\n"
 msgid "looking up '%s'\n"
 msgstr "recherche de « %s »\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 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:174
+#: dirmngr/dirmngr.c:178
 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:175
+#: dirmngr/dirmngr.c:179
 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:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "arrêter le dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "vider le cache"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
-
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "exécuter sans demander à l'utilisateur"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
-msgstr "forcer le chargement des listes de révocations de certificat obsolètes"
+#: dirmngr/dirmngr.c:218
+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:197
-msgid "allow sending OCSP requests"
-msgstr "permettre l'envoi de requêtes OCSP"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "Configuration pour les serveurs de clefs"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|utiliser le serveur de clefs à l'URL"
+
+#: dirmngr/dirmngr.c:244
+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:247
+msgid "Configuration for HTTP servers"
+msgstr "Configuration pour les serveurs HTTP"
+
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "interdire l'utilisation d'HTTP"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "interdire l'utilisation de LDAP"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 "ignorer les points de distribution de liste de révocations de certificat en "
 "HTTP"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|rediriger toutes les requêtes HTTP vers l'URL"
+
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "utiliser la configuration de serveur mandataire (proxy) du système"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration des serveurs LDAP à utiliser"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "interdire l'utilisation de LDAP"
+
+#: dirmngr/dirmngr.c:263
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 "ignorer les points de distribution de liste de révocations de certificat en "
 "LDAP"
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "ignorer les URL de service OCSP contenues dans le certificat"
-
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
-msgstr "|URL|rediriger toutes les requêtes HTTP vers l'URL"
-
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HÔTE|utiliser l'HÔTE pour les requêtes LDAP"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "ne pas utiliser d'hôtes de repli avec --ldap-proxy"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|utiliser ce serveur pour rechercher les clefs"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FICHIER|lire la liste de serveurs LDAP depuis le FICHIER"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 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:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|définir le temps d'expiration de LDAP à N secondes"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "Configuration pour OCSP"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "permettre l'envoi de requêtes OCSP"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignorer les URL de service OCSP contenues dans le certificat"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|utiliser le répondeur OCSP à l'URL"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|EMPR|réponse OCSP signée par EMPR"
 
-#: dirmngr/dirmngr.c:235
-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:240
-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
-msgid "route all network traffic via Tor"
-msgstr ""
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "forcer le chargement des listes de révocations de certificat obsolètes"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10550,11 +10751,11 @@ msgstr ""
 "(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
 "et options)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Utilisation : @DIRMNGR@ [options] (-h pour l'aide)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10563,85 +10764,85 @@ msgstr ""
 "Serveur de clefs, liste de révocations de certificat et accès OCSP pour "
 "@GNUPG@\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "les niveaux de débogage possibles sont : %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "utilisation : %s [options] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr ""
 "échec de récupération de liste de révocations de certificat sur « %s » : %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr ""
 "échec du traitement de liste de révocations de certificat sur « %s » : %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s : %u : ligne trop longue — ignorée\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s : %u : empreinte incorrecte détectée\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s : %u : erreur de lecture : %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, 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:1955
+#: dirmngr/dirmngr.c:1949
 #, 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:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 reçu — aucune action définie\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM reçu — arrêt…\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM reçu — encore %d connexions actives\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "arrêt forcé\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT reçu — arrêt immédiat\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d reçu — aucune action définie\n"
@@ -10833,92 +11034,92 @@ msgstr "échec de hachage de la réponse OCSP pour « %s » : %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "non signée par un certificat de signataire OCSP par défaut"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 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:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, 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:643
 #, 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:653
 #, 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:692
 #, 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:698
 #, 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:705
 #, 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:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "utilisation du répondeur OCSP « %s »\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, 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:792
 #, 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:793
 msgid "good"
 msgstr "correct"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, 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:846
 #, 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:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "le répondeur OCSP a renvoyé un trop vieil état\n"
@@ -10928,67 +11129,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:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "serialno manquant dans l'identifiant de certificat"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "échec d'assuan_inquire : %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "échec de fetch_cert_by_url : %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "erreur d'envoi de données : %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "échec de start_cert_fetch : %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "échec de fetch_next_cert : %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d dépassé\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossible d'allouer une structure de contrôle : %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "échec d'allocation du contexte Assuan : %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "impossible d'initialiser le serveur : %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problème d'accept_assuan : %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "problème de traitement Assuan : %s\n"
@@ -11038,7 +11239,7 @@ msgstr ""
 "le certificat n'aurait pas dû être utilisé pour signer une liste de "
 "révocations de certificat\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "silencieux"
 
@@ -11131,305 +11332,150 @@ msgstr "échec d'envoi de ligne : %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "erreur d'envoi d'options standards : %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Options contrôlant la sortie de diagnostique"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Options contrôlant la configuration"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Options pratiques pour le débogage"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Options contrôlant la sécurité"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|oublier les clefs SSH après N secondes"
-
-#: tools/gpgconf-comp.c:541
-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"
-
-#: tools/gpgconf-comp.c:545
-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"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Options d'application d'une politique de phrase secrète"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "pas de contournement de politique de phrase secrète"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|définir la taille minimale des nouvelles phrases secrètes à N"
-
-#: tools/gpgconf-comp.c:580
-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"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-"|FICHIER|vérifier la nouvelle phrase secrète par rapport aux motifs du "
-"FICHIER"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|la phrase secrète expire après N jours"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "ne pas autoriser la réutilisation d'anciennes phrases secrètes"
-
-#: tools/gpgconf-comp.c:596
-#, 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"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NOM|chiffrer aussi pour l'identité NOM"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|configurer les alias d'adresse"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "Configuration pour les serveurs de clefs"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL|utiliser le serveur de clefs à l'URL"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "permettre les recherches PKA (requêtes DNS)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MÉCANISMES|utiliser les MÉCANISMES pour localiser les clefs"
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "importer les clefs d'un serveur de clefs"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-#| msgid "list and check key signatures"
-msgid "include the public key in signatures"
-msgstr "afficher et vérifier les signatures de clefs"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "désactiver tous les accès au dirmngr"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NOM|utiliser l’encodage NOM pour les phrases secrète PKCS#12"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "ne pas vérifier les listes de révocations de certificat racine"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Options contrôlant le format de sortie"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Options contrôlant l'interactivité et la mise en application"
-
-#: tools/gpgconf-comp.c:978
-#, fuzzy
-#| msgid "Options controlling the security"
-msgid "Options controlling the use of Tor"
-msgstr "Options contrôlant la sécurité"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "Configuration pour les serveurs HTTP"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "utiliser la configuration de serveur mandataire (proxy) du système"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "Configuration des serveurs LDAP à utiliser"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "liste de serveurs LDAP"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "Configuration pour OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 #, fuzzy
 #| msgid "GPG for OpenPGP"
 msgid "OpenPGP"
 msgstr "GPG pour OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+#, fuzzy
+#| msgid "GPG for S/MIME"
+msgid "S/MIME"
+msgstr "GPG pour S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 #, fuzzy
 #| msgid "Smartcard Daemon"
 msgid "Smartcards"
 msgstr "Démon de carte à puce"
 
-#: tools/gpgconf-comp.c:1101
-#, fuzzy
-#| msgid "GPG for S/MIME"
-msgid "S/MIME"
-msgstr "GPG pour S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "erreur de réseau"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 #| msgid "PIN and Passphrase Entry"
 msgid "Passphrase Entry"
 msgstr "Entrée de code personnel et de phrase secrète"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "Composant non convenable pour le lancement"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, 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:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Échec de vérification externe du composant %s"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Remarquez que les spécifications de groupe sont ignorées\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, 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:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 #| msgid "error hashing '%s': %s\n"
 msgid "error parsing '%s'\n"
 msgstr "erreur du hachage de « %s » : %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "afficher tous les composants"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "vérifier tous les programmes"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|COMPOSANT|afficher les options"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|COMPOSANT|modifier les options"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|COMPOSANT|vérifier les options"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "appliquer les valeurs par défaut globales"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 #, fuzzy
 #| msgid "|FILE|take policy information from FILE"
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FICHIER|prendre renseignements de politique du FICHIER"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "aff. répertoires de configuration pour @GPGCONF@"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "afficher le fichier de configuration globale"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "vérifier le fichier de configuration globale"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "mettre la base de confiance à jour"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "recharger tous les composants ou celui donné"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "lancer un composant donné"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "tuer un composant donné"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "activer modif. pendant l'exécution si possible"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Utilisation : @GPGCONF@ [options] (-h pour l'aide)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11437,15 +11483,15 @@ msgstr ""
 "Syntaxe : @GPGCONF@ [options]\n"
 "Gérer les options de configuration pour les outils du système @GNUPG@\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Un argument de composant nécessaire"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Composant introuvable"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "Aucun argument permis"
 
@@ -11462,6 +11508,42 @@ msgstr ""
 "Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
 "ficmotif\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "erreur d'écriture du fichier temporaire : %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "utiliser un fichier journal pour le serveur"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|FICHIER|écrire un journal serveur dans le FICHIER"
+
+#~ msgid "run without asking a user"
+#~ msgstr "exécuter sans demander à l'utilisateur"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "permettre les recherches PKA (requêtes DNS)"
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "importer les clefs d'un serveur de clefs"
+
+#, fuzzy
+#~| msgid "list and check key signatures"
+#~ msgid "include the public key in signatures"
+#~ msgstr "afficher et vérifier les signatures de clefs"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "Options contrôlant le format de sortie"
+
+#, fuzzy
+#~| msgid "Options controlling the security"
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Options contrôlant la sécurité"
+
+#~ msgid "LDAP server list"
+#~ msgstr "liste de serveurs LDAP"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "demande de la clef %s sur le serveur %s %s\n"
 
@@ -11634,9 +11716,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "impossible d'ouvrir %s en écriture : %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "erreur d'écriture sur %s : %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "erreur de lecture de %s : %s\n"
 
@@ -11810,9 +11889,6 @@ msgstr ""
 #~ msgid "listen() failed: %s\n"
 #~ msgstr "échec de listen() : %s\n"
 
-#~ msgid "do not grab keyboard and mouse"
-#~ msgstr "ne pas capturer le clavier et la souris"
-
 #~ msgid "Error: URL too long (limit is %d characters).\n"
 #~ msgstr "Erreur : URL trop longue (limitée à %d caractères).\n"
 
diff --git a/po/gl.po b/po/gl.po
index a6c8feb..ed1071a 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -134,8 +134,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "contrasinal erróneo"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr ""
 
@@ -185,13 +185,47 @@ msgstr "MPI erróneo"
 msgid "Bad Passphrase"
 msgstr "contrasinal erróneo"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "cambia-lo contrasinal"
+
+#: agent/command.c:2423
+#, 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:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protección %d%s non está soportado\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -199,190 +233,173 @@ msgstr "o algoritmo de protección %d%s non está soportado\n"
 msgid "can't create '%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, fuzzy, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "erro ao crea-lo contrasinal: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "cambia-lo contrasinal"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: fallo ao crear unha táboa hash: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Introduza o ID de usuario: "
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Repita o contrasinal: "
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Repita o contrasinal: "
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita o contrasinal: "
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erro ao crea-lo contrasinal: %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "escribindo a `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduza o contrasinal\n"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "¿Empregar esta chave de tódolos xeitos?"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, 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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -390,7 +407,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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -398,166 +415,234 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
 #, fuzzy
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@\n"
-"Opcións:\n"
-" "
+msgid "Options used for startup"
+msgstr "habilitar depuración total"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "A chave é obsoleta"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "lareto"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "ser un pouquiño máis calado"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:192
-#, fuzzy
-msgid "use a log file for the server"
-msgstr "buscar chaves nun servidor de chaves"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "lareto"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "ser un pouquiño máis calado"
+
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "non está soportado"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "non está soportado"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
 #: agent/gpg-agent.c:244
-msgid "do not use the PIN cache when signing"
+msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:248
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:250
 #, 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:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:258
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:276
 #, fuzzy
-#| msgid "not supported"
-msgid "enable ssh support"
-msgstr "non está soportado"
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|emprega-lo modo de contrasinal N"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:278
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:283
 #, fuzzy
-#| msgid "not supported"
-msgid "enable putty support"
-msgstr "non está soportado"
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "emprega-lo gpg-agent"
+
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -565,149 +650,159 @@ 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:551
+#: agent/gpg-agent.c:572
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Revocación de certificado válida"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, 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:2374
+#: agent/gpg-agent.c:2356
 #, 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:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "o segredo da actualización fallou: %s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opcións:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -719,8 +814,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -728,9 +823,8 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -784,43 +878,43 @@ msgstr "Cancelar"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "erro de lectura: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "hai partes da chave secreta non dispoñibles\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "erro de lectura: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -833,19 +927,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "si|sim"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -858,7 +952,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -868,48 +962,48 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 #, fuzzy
 msgid "Change passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 msgid "Delete key"
 msgstr "habilitar unha chave"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -940,7 +1034,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -958,52 +1052,52 @@ msgstr "o algoritmo de protección %d%s non está soportado\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "o algoritmo de protección %d%s non está soportado\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
@@ -1034,12 +1128,12 @@ msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "a actualización fallou: %s\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
@@ -1100,22 +1194,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1459,7 +1553,7 @@ msgstr "opcións de importación non válidas\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opcións de importación non válidas\n"
@@ -1489,19 +1583,19 @@ msgstr ""
 msgid "invalid option \"%.50s\"\n"
 msgstr "opcións de importación non válidas\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "NOTA: non existe o ficheiro de opcións por defecto `%s'\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "ficheiro de opcións `%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1521,41 +1615,41 @@ msgstr "non se puido abrir un ficheiro: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "non se atopou a chave pública %08lX: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1795,23 +1889,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
@@ -1827,8 +1921,8 @@ msgstr "Non se admite este comando no modo %s.\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1838,230 +1932,230 @@ msgstr "¿A súa selección? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave pública correspondente: %s\n"
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeración da chave fallou: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP válidos.\n"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "¿Qué tamaño de chave quere? (1024) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 msgid "Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (só asinar)\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Selección non válida.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2069,184 +2163,184 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 #, 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:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "saír deste menú"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispoñible en: "
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiración"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2310,8 +2404,8 @@ msgid "subkey"
 msgstr "Pública: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualización fallou: %s\n"
@@ -2351,26 +2445,26 @@ msgstr "non se pode empregar un paquete simétrico ESK debido ao modo S2K\n"
 msgid "using cipher %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' xa está comprimido\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "AVISO: `%s' é un ficheiro baleiro\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
@@ -2393,7 +2487,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2402,40 +2502,40 @@ msgstr ""
 "forza-lo algoritmo de compresión %s (%d) viola as preferencias do "
 "destinatario\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo descoñecido %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado simétrico.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao manexa-lo paquete cifrado\n"
@@ -2634,235 +2734,286 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "emprégase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 #, fuzzy
 msgid "make a signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar só con cifrado simétrico"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro público"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "actualizar tódalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
-msgid "create ascii armored output"
-msgstr "crear saída con armadura en ascii"
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
+#: g10/gpg.c:596 sm/gpgsm.c:332
 #, fuzzy
-msgid "|USER-ID|encrypt for USER-ID"
+msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "non facer ningún cambio"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "avisar antes de sobrescribir"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr ""
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr ""
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
+msgid "create ascii armored output"
+msgstr "crear saída con armadura en ascii"
+
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
 #, fuzzy
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "empregar este id de usuario para asinar ou descifrar"
+msgid "|FILE|write output to FILE"
+msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "usar modo de texto canónico"
+
+#: g10/gpg.c:743
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresión a N (0 desactiva)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "usar modo de texto canónico"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr ""
+
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr ""
+
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr ""
+
+#: g10/gpg.c:803 sm/gpgsm.c:324
 #, fuzzy
-msgid "|FILE|write output to FILE"
-msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "non facer ningún cambio"
+#: g10/gpg.c:805 sm/gpgsm.c:326
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "avisar antes de sobrescribir"
+#: g10/gpg.c:813 sm/gpgsm.c:328
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2870,7 +3021,7 @@ msgstr ""
 "@\n"
 "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2900,13 +3051,13 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2921,7 +3072,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2929,551 +3080,551 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Pública: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: gpg [opcións] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "non se atopou un signo = na definición do grupo \"%s\"\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, 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:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, 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:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro está unha chave listada"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, 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:3086
+#: g10/gpg.c:3085
 #, 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:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, 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:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, 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:3218
+#: g10/gpg.c:3217
 #, 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:3221
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcións de importación non válidas\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, 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:3261
+#: g10/gpg.c:3260
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, 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:3301
+#: g10/gpg.c:3300
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, 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:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s non ten sentido empregándoo con %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, 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:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, fuzzy, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non válido; debe ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non válidas\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non válidas\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non válidas\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresión personais non válidas\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "¡%s aínda non traballa con %s!\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, 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:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o envío ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepción do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportación da chave fallou: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, 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:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualización no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, 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:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a súa mensaxe ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, 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:5492
+#: g10/gpg.c:5490
 #, 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:5525
+#: g10/gpg.c:5523
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
@@ -3487,7 +3638,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la información de estado a este DF"
 
@@ -4205,7 +4356,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¿Está seguro de que quere asinalo? (s/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
@@ -4404,8 +4555,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -4621,7 +4772,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "A chave está revocada."
 
@@ -4674,7 +4825,7 @@ msgstr "¿Seguro de que quere borrar este ID de usuario? "
 msgid "Really move the primary key? (y/N) "
 msgstr "¿Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
@@ -4763,169 +4914,169 @@ msgstr "¿Garda-los cambios? "
 msgid "Quit without saving? (y/N) "
 msgstr "¿Saír sin gardar? "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valor non válido\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   asinada por %08lX no %s%s\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Características: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 #, fuzzy
 msgid "Notations: "
 msgstr "Notación: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Esta chave está desactivada"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4933,19 +5084,19 @@ msgstr ""
 "Teña en conta que a validez da chave amosada non é necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4954,18 +5105,18 @@ msgstr ""
 "AVISO: non se marcou ningún ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4974,37 +5125,37 @@ msgstr ""
 "AVISO: Esta é unha chave de estilo PGP2. Se engade unha identificación\n"
 "       fotográfica algunhas versións de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¿Está seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificación fotográfica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5012,38 +5163,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Borrada %d sinatura.\n"
 msgstr[1] "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non válida"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" está revocado."
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "O ID de usuario \"%s\" está revocado."
 msgstr[1] "O ID de usuario \"%s\" está revocado."
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5053,45 +5204,45 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versións de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5099,184 +5250,184 @@ msgid ""
 msgstr ""
 "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiración da chave primaria.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Cambiando a data de expiración da chave primaria.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notación de sinaturas: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "¿Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿Está seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 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:6026
+#: g10/keyedit.c:6082
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:6055
+#: g10/keyedit.c:6111
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5751,7 +5902,7 @@ msgstr ""
 "números aleatorios unha opoertunidade de acumular entropía de abondo.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeración da chave fallou: %s\n"
@@ -5822,11 +5973,11 @@ msgstr "non se atopou un chaveiro público no que se poida escribir: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "erro escribindo no chaveiro público `%s': %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 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:5229
+#: g10/keygen.c:5226
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5836,7 +5987,7 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5844,7 +5995,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5852,23 +6003,23 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "¿Crear realmente? "
@@ -6086,267 +6237,267 @@ msgstr "solicitando a chave %08lX de %s\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamaño moi estraño para unha chave de sesión cifrada (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chave de sesión cifrada con %s\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo descoñecido %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave pública: DEK correcto\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave pública: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supoñendo datos cifrados con %s\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, 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:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: ¡a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificación de sinatura suprimida\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, 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:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Chave dispoñible en: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "descoñecido"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritmo de chave pública descoñecido"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "non é unha sinatura separada\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura ó vello estilo (PGP 2.x)\n"
@@ -6417,68 +6568,68 @@ msgstr "erro de lectura: %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opción a extinguir \"%s\"\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensaxe pode non ser utilizable por %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "lendo as opcións de `%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "clase de sinatura descoñecida"
@@ -6514,24 +6665,24 @@ msgstr "escribindo na saída estándar\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "suponse que hai datos asinados en `%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "non é posible manexa-lo algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesión cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notación de sinaturas críticas: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit crítico posto\n"
@@ -6960,12 +7111,12 @@ msgstr "destinatario por defecto `%s' descoñecido\n"
 msgid "no valid addressees\n"
 msgstr "non hai enderezos válidos\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
@@ -7401,7 +7552,7 @@ msgstr ""
 "omítese `%s': ¡esta é unha chave ElGamal xerada por PGP que non é segura "
 "para sinaturas!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@ -7449,7 +7600,7 @@ msgstr "erro ao buscar un rexistro de confianza: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "erro de lectura: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronización: %s\n"
@@ -7959,100 +8110,100 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' non é un ID longo de chave válido\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceptada como chave de confianza\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "a chave %08lX aparece máis dunha vez na base de datos de confianza\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: non hai unha chave pública para a chave de confianza - omitida\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chave marcada coma de confianza absoluta.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo da petición %d: fallou a lectura: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "o rexistro de confianza %lu non é do tipo %d solicitado\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "non se atopou a chave pública %08lX: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, 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:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8060,45 +8211,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 ""
 
@@ -8110,43 +8261,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 ""
 
@@ -8195,35 +8346,35 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 #, 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "cambia-lo contrasinal"
@@ -8291,7 +8442,7 @@ msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
@@ -8356,7 +8507,7 @@ msgstr ""
 msgid "verify CHV%d failed: %s\n"
 msgstr "o envío ao servidor de chaves fallou: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
@@ -8502,13 +8653,13 @@ msgstr "Sinatura %s, algoritmo de resumo %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP válidos.\n"
@@ -8526,81 +8677,87 @@ msgstr "cambia-lo contrasinal"
 msgid "|N|Initial New PIN"
 msgstr "Introduza o ID de usuario: "
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa-la terminal en absoluto"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:179
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "comandos conflictivos\n"
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
-msgstr ""
-
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8659,7 +8816,7 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8830,7 +8987,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Revocación de certificado válida"
@@ -8886,7 +9043,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -8897,7 +9054,7 @@ msgstr "non procesado"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 #, fuzzy
 msgid "none"
 msgstr "non|nom"
@@ -8933,42 +9090,37 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, fuzzy, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
@@ -9163,6 +9315,11 @@ msgstr "¿Crear un certificado de revocación para esta sinatura? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9241,134 +9398,134 @@ msgstr "fallou o borrado do bloque de chaves: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Non se deu unha descrición)\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 #, fuzzy
 msgid "list external keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocación de certificado válida"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:258
-#, fuzzy
-msgid "create base-64 encoded output"
-msgstr "crear saída con armadura en ascii"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "non usa-la terminal en absoluto"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:278
-msgid "never consult a CRL"
-msgstr ""
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "crear saída con armadura en ascii"
 
-#: sm/gpgsm.c:288
-msgid "check validity using OCSP"
-msgstr ""
+#: sm/gpgsm.c:330
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr ""
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "engadir este chaveiro á lista de chaveiros"
 
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:299
-msgid "do not check certificate policies"
+#: sm/gpgsm.c:354
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
+
+#: sm/gpgsm.c:372
+msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "non usa-la terminal en absoluto"
+#: sm/gpgsm.c:380
+msgid "check validity using OCSP"
+msgstr ""
 
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:382
+msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
-#, fuzzy
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
+
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maioría das preguntas"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "asumir `non' na maioría das preguntas"
 
-#: sm/gpgsm.c:329
+#: sm/gpgsm.c:418
 #, fuzzy
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "engadir este chaveiro á lista de chaveiros"
-
-#: sm/gpgsm.c:332
-#, fuzzy
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|NOME|empregar NOME coma chave secreta por defecto"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-#, fuzzy
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9379,27 +9536,27 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9459,7 +9616,7 @@ msgstr "rev? problema ao comproba-la revocación: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr ""
 
@@ -9489,7 +9646,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9534,23 +9691,23 @@ msgstr ""
 msgid "algorithm:"
 msgstr "armadura: %s\n"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Sinatura correcta de \""
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "               alias \""
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -10353,116 +10510,140 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-msgid "run without asking a user"
-msgstr "¿Saír sin gardar? "
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:242
+#, fuzzy
+msgid "|URL|use keyserver at URL"
+msgstr "non se puido analisa-lo URI do servidor de chaves\n"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
+
+#: dirmngr/dirmngr.c:271
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:227
-#, fuzzy
-msgid "|URL|use OCSP responder at URL"
-msgstr "non se puido analisa-lo URI do servidor de chaves\n"
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr ""
 
-#: dirmngr/dirmngr.c:229
-msgid "|FPR|OCSP response signed by FPR"
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+#: dirmngr/dirmngr.c:285
+#, fuzzy
+msgid "|URL|use OCSP responder at URL"
+msgstr "non se puido analisa-lo URI do servidor de chaves\n"
+
+#: dirmngr/dirmngr.c:287
+msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10475,95 +10656,95 @@ msgstr ""
 "@\n"
 "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "uso: gpg [opcións] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "liña longa de máis\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "erro de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "non procesado"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -10757,92 +10938,92 @@ msgstr "o cambio de permisos de `%s' fallou: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 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:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Certificado correcto"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10852,68 +11033,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, 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:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10959,7 +11140,7 @@ msgstr "Revocación de certificado válida"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 #, fuzzy
 msgid "quiet"
 msgstr "abandonar"
@@ -11053,309 +11234,157 @@ msgstr "fallou a sinatura: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr ""
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-#, fuzzy
-msgid "Options useful for debugging"
-msgstr "habilitar depuración total"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr ""
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-
-#: tools/gpgconf-comp.c:588
-#, fuzzy
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|emprega-lo modo de contrasinal N"
-
-#: tools/gpgconf-comp.c:592
-#, fuzzy
-msgid "do not allow the reuse of old passphrases"
-msgstr "erro ao crea-lo contrasinal: %s\n"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOME|empregar NOME coma chave secreta por defecto"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-#, fuzzy
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NOME|cifrar para NOME"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-#, fuzzy
-msgid "|URL|use keyserver at URL"
-msgstr "non se puido analisa-lo URI do servidor de chaves\n"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "importar chaves dun servidor de chaves"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-msgid "include the public key in signatures"
-msgstr "verifica-las sinaturas das chaves"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr ""
-
-#: tools/gpgconf-comp.c:838
-#, fuzzy
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr ""
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr ""
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "erro de rede"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "contrasinal erróneo"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "non se atopou a chave pública"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "list global configuration file"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 #, fuzzy
 msgid "check global configuration file"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "usar coma ficheiro de saída"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 #, fuzzy
 msgid "Component not found"
 msgstr "non se atopou a chave pública"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 #, fuzzy
 msgid "No argument allowed"
 msgstr "gravando a chave secreta en `%s'\n"
@@ -11372,6 +11401,27 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "escribindo a `%s'\n"
+
+#, fuzzy
+#~ msgid "use a log file for the server"
+#~ msgstr "buscar chaves nun servidor de chaves"
+
+#, fuzzy
+#~ msgid "run without asking a user"
+#~ msgstr "¿Saír sin gardar? "
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "importar chaves dun servidor de chaves"
+
+#, fuzzy
+#~ msgid "include the public key in signatures"
+#~ msgstr "verifica-las sinaturas das chaves"
+
+#, fuzzy
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "solicitando a chave %08lX de %s\n"
 
@@ -11513,10 +11563,6 @@ msgstr ""
 #~ msgstr "non se puido abrir %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "erro escribindo no chaveiro `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "erro lendo `%s': %s\n"
 
@@ -13262,9 +13308,6 @@ msgstr ""
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "nunca usar un MDC para cifrar"
 
-#~ msgid "use the gpg-agent"
-#~ msgstr "emprega-lo gpg-agent"
-
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[ficheiro]|escribi-la información de estado no ficheiro"
 
diff --git a/po/gnupg2.pot b/po/gnupg2.pot
index 1818d52..30a34a1 100644
--- a/po/gnupg2.pot
+++ b/po/gnupg2.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.2.33\n"
+"Project-Id-Version: GNU gnupg 2.2.37\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -130,8 +130,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr ""
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr ""
 
@@ -176,199 +176,216 @@ msgstr ""
 msgid "Bad Passphrase"
 msgstr ""
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr ""
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr ""
+
+#: agent/command.c:2423
+#, c-format
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr ""
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr ""
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr ""
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr ""
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr ""
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr ""
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr ""
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr ""
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr ""
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, c-format
-msgid "error writing to temporary file: %s\n"
+msgid "error writing to pipe: %s\n"
 msgstr ""
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr ""
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr ""
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, 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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, 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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -376,289 +393,363 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 
-#: agent/genkey.c:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr ""
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr ""
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
 msgstr ""
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
 msgstr ""
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:203
-msgid "do not use the SCdaemon"
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
 msgstr ""
 
 #: agent/gpg-agent.c:207
+msgid "do not use the SCdaemon"
+msgstr ""
+
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:213
 msgid "|NAME|accept some commands via NAME"
 msgstr ""
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr ""
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr ""
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
 #: agent/gpg-agent.c:244
-msgid "do not use the PIN cache when signing"
+msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:246
-msgid "disallow the use of an external password cache"
+msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:248
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:250
+msgid "disallow the use of an external password cache"
+msgstr ""
+
+#: agent/gpg-agent.c:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 msgid "allow presetting passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr ""
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr ""
+
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr ""
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr ""
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
+msgstr ""
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
+msgstr ""
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:258
-msgid "enable ssh support"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 
-#: agent/gpg-agent.c:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr ""
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
@@ -669,16 +760,15 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
 msgstr ""
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -725,43 +815,43 @@ msgstr ""
 msgid "error while asking for the passphrase: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr ""
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr ""
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -774,18 +864,18 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr ""
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -798,7 +888,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -808,46 +898,46 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr ""
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr ""
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr ""
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -878,7 +968,7 @@ msgstr ""
 msgid "secret key parts are not available\n"
 msgstr ""
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr ""
@@ -893,52 +983,52 @@ msgstr ""
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr ""
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr ""
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr ""
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr ""
@@ -968,12 +1058,12 @@ msgstr ""
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr ""
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr ""
@@ -1033,22 +1123,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr ""
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1348,7 +1438,7 @@ msgstr ""
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr ""
@@ -1378,17 +1468,17 @@ msgstr ""
 msgid "invalid option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr ""
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr ""
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1408,41 +1498,41 @@ msgstr ""
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr ""
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr ""
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr ""
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr ""
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr ""
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr ""
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1663,22 +1753,22 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr ""
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, c-format
 msgid "Note: %s\n"
 msgstr ""
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr ""
 
-#: g10/card-util.c:91 g10/card-util.c:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1694,8 +1784,8 @@ msgstr ""
 msgid "Reset Code not or not anymore available\n"
 msgstr ""
 
-#: g10/card-util.c:140 g10/card-util.c:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1705,217 +1795,217 @@ msgstr ""
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr ""
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr ""
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr ""
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr ""
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr ""
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr ""
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 msgid "Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 msgid "Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr ""
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr ""
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr ""
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr ""
 
-#: g10/card-util.c:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr ""
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1923,165 +2013,165 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 msgid "Please select the type of key to generate:\n"
 msgstr ""
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr ""
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 
-#: g10/card-util.c:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr ""
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr ""
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr ""
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr ""
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr ""
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr ""
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr ""
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 msgid "change the key attribute"
 msgstr ""
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr ""
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr ""
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr ""
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2140,8 +2230,8 @@ msgid "subkey"
 msgstr ""
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
@@ -2181,24 +2271,24 @@ msgstr ""
 msgid "using cipher %s\n"
 msgstr ""
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr ""
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr ""
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2219,45 +2309,51 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr ""
@@ -2436,218 +2532,266 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr ""
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr ""
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr ""
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr ""
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr ""
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr ""
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr ""
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr ""
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr ""
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr ""
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr ""
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr ""
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr ""
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr ""
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr ""
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr ""
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr ""
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr ""
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr ""
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr ""
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr ""
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr ""
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "quickly revoke a key signature"
 msgstr ""
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr ""
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr ""
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr ""
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr ""
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr ""
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr ""
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr ""
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr ""
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr ""
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr ""
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr ""
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr ""
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr ""
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
 msgstr ""
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+msgid "Options to specify keys"
+msgstr ""
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr ""
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr ""
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2659,554 +2803,554 @@ msgid ""
 " --fingerprint [names]      show fingerprints\n"
 msgstr ""
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr ""
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 msgstr ""
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
 msgstr ""
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr ""
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr ""
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1660
+#: g10/gpg.c:1686
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr ""
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr ""
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr ""
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr ""
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr ""
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr ""
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3843
+#: g10/gpg.c:3841
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr ""
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4289
+#: g10/gpg.c:4287
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4292
+#: g10/gpg.c:4290
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr ""
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
@@ -3219,7 +3363,7 @@ msgstr ""
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:86 sm/gpgsm.c:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr ""
 
@@ -3901,7 +4045,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -4063,8 +4207,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr ""
@@ -4250,7 +4394,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr ""
 
@@ -4298,7 +4442,7 @@ msgstr ""
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr ""
 
@@ -4372,475 +4516,475 @@ msgstr ""
 msgid "Quit without saving? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2476
+#: g10/keyedit.c:2532
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr ""
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr ""
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr ""
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr ""
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr ""
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr ""
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr ""
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr ""
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr ""
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr ""
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 msgid "Changing usage of a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 msgid "Changing usage of the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr ""
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:6314
+#: g10/keyedit.c:6370
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5267,7 +5411,7 @@ msgid ""
 msgstr ""
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
@@ -5333,44 +5477,44 @@ msgstr ""
 msgid "error writing public keyring '%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keygen.c:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 
-#: g10/keygen.c:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr ""
 
@@ -5578,260 +5722,260 @@ msgstr ""
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr ""
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr ""
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr ""
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr ""
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr ""
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr ""
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr ""
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 
-#: g10/mainproc.c:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr ""
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr ""
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ""
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
@@ -5896,67 +6040,67 @@ msgstr ""
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr ""
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr ""
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr ""
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr ""
@@ -5989,22 +6133,22 @@ msgstr ""
 msgid "assuming signed data in '%s'\n"
 msgstr ""
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr ""
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -6388,12 +6532,12 @@ msgstr ""
 msgid "no valid addressees\n"
 msgstr ""
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr ""
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr ""
@@ -6785,7 +6929,7 @@ msgstr ""
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
@@ -6828,7 +6972,7 @@ msgstr ""
 msgid "read error in '%s': %s\n"
 msgstr ""
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
@@ -7321,143 +7465,143 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr ""
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr ""
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr ""
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 ""
 
@@ -7469,39 +7613,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 ""
 
@@ -7544,33 +7688,33 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr ""
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 
-#: scd/app-p15.c:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr ""
 
@@ -7635,7 +7779,7 @@ msgstr ""
 msgid "failed to store the creation date: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
@@ -7698,7 +7842,7 @@ msgstr ""
 msgid "verify CHV%d failed: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
@@ -7839,13 +7983,13 @@ msgstr ""
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -7861,75 +8005,81 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr ""
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
 msgstr ""
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr ""
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr ""
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -7987,7 +8137,7 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr ""
@@ -8146,7 +8296,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr ""
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -8200,7 +8350,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8211,7 +8361,7 @@ msgstr ""
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr ""
 
@@ -8241,42 +8391,37 @@ msgid ""
 "created %s, expires %s.\n"
 msgstr ""
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr ""
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
@@ -8462,6 +8607,11 @@ msgstr ""
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr ""
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -8537,150 +8687,150 @@ msgstr ""
 msgid "no valid recipients given\n"
 msgstr ""
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr ""
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr ""
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr ""
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr ""
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:267
-msgid "assume input is in PEM format"
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:269
-msgid "assume input is in base-64 format"
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:271
-msgid "assume input is in binary format"
+#: sm/gpgsm.c:307
+msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:278
-msgid "never consult a CRL"
+#: sm/gpgsm.c:309
+msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:288
-msgid "check validity using OCSP"
+#: sm/gpgsm.c:311
+msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
 msgstr ""
 
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:299
-msgid "do not check certificate policies"
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:352
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:372
+msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:324
-msgid "batch mode: never ask"
+#: sm/gpgsm.c:380
+msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:325
-msgid "assume yes on most questions"
+#: sm/gpgsm.c:382
+msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:326
-msgid "assume no on most questions"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
+#: sm/gpgsm.c:398
+msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
+#: sm/gpgsm.c:400
+msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
+#: sm/gpgsm.c:401
+msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr ""
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 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:788
+#: sm/gpgsm.c:814
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr ""
 
-#: sm/gpgsm.c:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr ""
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -8740,7 +8890,7 @@ msgstr ""
 msgid "error storing flags: %s\n"
 msgstr ""
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr ""
 
@@ -8770,7 +8920,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -8815,23 +8965,23 @@ msgstr ""
 msgid "algorithm:"
 msgstr ""
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr ""
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr ""
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -9596,205 +9746,228 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
-msgid "ignore HTTP CRL distribution points"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:251
+msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr ""
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr ""
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr ""
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:227
-msgid "|URL|use OCSP responder at URL"
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:229
-msgid "|FPR|OCSP response signed by FPR"
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+#: dirmngr/dirmngr.c:285
+msgid "|URL|use OCSP responder at URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:287
+msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr ""
+
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
 "options)\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr ""
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr ""
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -9984,91 +10157,91 @@ msgstr ""
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10078,67 +10251,67 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr ""
@@ -10181,7 +10354,7 @@ msgstr ""
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr ""
 
@@ -10272,289 +10445,146 @@ msgstr ""
 msgid "error sending standard options: %s\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr ""
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr ""
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr ""
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr ""
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr ""
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr ""
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr ""
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-
-#: tools/gpgconf-comp.c:764
-msgid "import missing key from a signature"
-msgstr ""
-
-#: tools/gpgconf-comp.c:767
-msgid "include the public key in signatures"
-msgstr ""
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr ""
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr ""
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr ""
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr ""
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr ""
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr ""
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr ""
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr ""
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr ""
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr ""
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index a2a0839..86ebeca 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -133,8 +133,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "rossz jelszó"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr ""
 
@@ -184,13 +184,47 @@ msgstr "hibás MPI"
 msgid "Bad Passphrase"
 msgstr "rossz jelszó"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "Hiba a jelszó létrehozásakor: %s.\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "jelszóváltoztatás"
+
+#: agent/command.c:2423
+#, 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:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s védő algoritmus nem támogatott.\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -198,189 +232,172 @@ msgstr "%d%s védő algoritmus nem támogatott.\n"
 msgid "can't create '%s': %s\n"
 msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, fuzzy, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "Hiba a jelszó létrehozásakor: %s.\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "Nem írható titkoskulcs-karikát találtam: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "jelszóváltoztatás"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Ismételje meg a jelszót: "
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Ismételje meg a jelszót: "
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ismételje meg a jelszót: "
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "Hiba a jelszó létrehozásakor: %s.\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "�rok a \"%s\" állományba.\n"
+msgid "error writing to pipe: %s\n"
+msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "�rja be a jelszót!\n"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Mégis használjuk ezt a kulcsot? "
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, 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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -388,7 +405,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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -396,314 +413,391 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-#, fuzzy
-msgid ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
 msgstr ""
-"@\n"
-"Opciók:\n"
-" "
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "A kulcsot lecserélték."
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "bőbeszédű mód"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "még szűkszavúbb mód"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:192
-#, fuzzy
-msgid "use a log file for the server"
-msgstr "kulcsok keresése kulcsszerveren"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "bőbeszédű mód"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "még szűkszavúbb mód"
+
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatbázis frissítése"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "nem támogatott"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "nem támogatott"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
 #: agent/gpg-agent.c:244
-msgid "do not use the PIN cache when signing"
+msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:248
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:250
 #, 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:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:258
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:276
 #, fuzzy
-#| msgid "not supported"
-msgid "enable ssh support"
-msgstr "nem támogatott"
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|N. sorszámú jelszómód használata"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:278
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "Hiba a jelszó létrehozásakor: %s.\n"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:283
 #, fuzzy
-#| msgid "not supported"
-msgid "enable putty support"
-msgstr "nem támogatott"
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "gpg ügynök használata"
+
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 #, 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:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozható létre: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, 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:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: Könyvtárat létrehoztam.\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, 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:2374
+#: agent/gpg-agent.c:2356
 #, 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:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opciók:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -715,8 +809,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -724,9 +818,8 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -780,43 +873,43 @@ msgstr "Mégsem"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -829,19 +922,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "igen"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -854,7 +947,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -864,48 +957,48 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 #, fuzzy
 msgid "Change passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Valóban törli a kiválasztott kulcsokat? "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 msgid "Delete key"
 msgstr "kulcs engedélyezése"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -936,7 +1029,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -954,52 +1047,52 @@ msgstr "%d%s védő algoritmus nem támogatott.\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "%d%s védő algoritmus nem támogatott.\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
@@ -1030,12 +1123,12 @@ msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
@@ -1096,22 +1189,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1451,7 +1544,7 @@ msgstr "Érvénytelen import opciók!\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "Érvénytelen import opciók!\n"
@@ -1481,19 +1574,19 @@ msgstr ""
 msgid "invalid option \"%.50s\"\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "MEGJEGYZÉS: Nincs alapértelmezett opciós fájl (%s).\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "\"%s\" opciós fájl: %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1513,41 +1606,41 @@ msgstr "Nem tudom megnyitni az állományt: %s.\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "A(z) %08lX nyilvános kulcsot nem találom: %s.\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1786,23 +1879,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, 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:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
@@ -1818,8 +1911,8 @@ msgstr "Ez a parancs %s módban nem engedélyezett.\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1829,230 +1922,230 @@ msgstr "Mit választ? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozzá tartozó nyilvános kulcs: %s\n"
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenciák frissítése"
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Érvénytelen karakter a preferenciák között!\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Érvénytelen karakter a preferenciák között!\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgenerálás sikertelen: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem találtam érvényes OpenPGP adatot.\n"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsméretet szeretne? (1024) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerekítve %u bitre.\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (csak aláírás)\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Érvénytelen választás.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, 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:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2060,184 +2153,184 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 #, 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:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 #, 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:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "kilépés ebből a menüből"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "megmutatja ezt a súgót"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs található: "
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 #, fuzzy
 msgid "change the login name"
 msgstr "lejárat megváltoztatása"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megbízhatóságának beállítása"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 #, fuzzy
 msgid "generate new keys"
 msgstr "új kulcspár létrehozása"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, 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:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opció nem működik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2300,8 +2393,8 @@ msgid "subkey"
 msgstr "Nyilvános kulcsú (pubkey): "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
@@ -2341,27 +2434,27 @@ msgstr "Nem tudok szimmetrikus ESK csomagot használni a S2K mód miatt!\n"
 msgid "using cipher %s\n"
 msgstr "%s rejtjelezést használok.\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "\"%s\" már tömörített.\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" állomány üres.\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "Lehet, hogy nem használhatja \"%s\" rejtjelező algoritmust %s módban!\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2384,47 +2477,53 @@ msgstr "A %s (%d) rejtjelező használata sérti a címzett preferenciáit!\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "A %s (%d) tömörítés használata sérti a címzett preferenciáit!\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelező használata sérti a címzett preferenciáit!\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkosítva \"%s\" számára\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s titkosított adat.\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "FIGYELEM: Az üzenet szimmetrikus titkosítását gyenge kulccsal végezték.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "Probléma a titkosított csomag kezelésekor!\n"
@@ -2624,235 +2723,286 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX másodlagos kulcsot használjuk a %08lX elsődleges helyett.\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 #, fuzzy
 msgid "make a signature"
 msgstr "különálló aláírás készítése"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fájl]|olvasható szöveg aláírása"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "különálló aláírás készítése"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "adat titkosítása"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "titkosítás csak szimmetrikus rejtjelezővel"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "adat visszafejtése (alapértelmezés)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "aláírás ellenőrzése"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "kulcsok listázása"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "kulcsok és aláírások listázása"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsaláírások ellenőrzése"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "kulcsok és ujjlenyomatok listázása"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "titkos kulcsok listázása"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok eltávolítása a titkoskulcs-karikáról"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "kulcs aláírása"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "kulcs aláírása helyileg"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "kulcs aláírása"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "kulcs aláírása helyileg"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "kulcs aláírása vagy szerkesztése"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 #, fuzzy
 msgid "change a passphrase"
 msgstr "jelszóváltoztatás"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "kulcsok exportálása"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "kulcsok exportálása kulcsszerverre"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "kulcsok importálása kulcsszerverről"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "kulcsok keresése kulcsszerveren"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs frissítése kulcsszerverről"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "kulcsok importálása/összefűzése"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "bizalmi adatbázis frissítése"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
-msgid "create ascii armored output"
-msgstr "ascii páncélozott kimenet létrehozása"
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
+#: g10/gpg.c:596 sm/gpgsm.c:332
 #, fuzzy
-msgid "|USER-ID|encrypt for USER-ID"
+msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NÉV|titkosítás NÉV részére"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "ne csináljon semmi változtatást"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "felülírás előtt rákérdezés"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr ""
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr ""
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
+msgid "create ascii armored output"
+msgstr "ascii páncélozott kimenet létrehozása"
+
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
 #, fuzzy
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "felh. azonosító aláíráshoz és visszafejtéshez"
+msgid "|FILE|write output to FILE"
+msgstr "|fájl|bővítő modul betöltése"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "kanonikus szöveges mód használata"
+
+#: g10/gpg.c:743
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|tömörítési szint beállítása N-re (0: tiltás)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "kanonikus szöveges mód használata"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr ""
+
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr ""
+
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr ""
+
+#: g10/gpg.c:803 sm/gpgsm.c:324
 #, fuzzy
-msgid "|FILE|write output to FILE"
-msgstr "|fájl|bővítő modul betöltése"
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "titkos kulcsok listázása"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "ne csináljon semmi változtatást"
+#: g10/gpg.c:805 sm/gpgsm.c:326
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|NÉV|titkosítás NÉV részére"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "felülírás előtt rákérdezés"
+#: g10/gpg.c:813 sm/gpgsm.c:328
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "felh. azonosító aláíráshoz és visszafejtéshez"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2860,7 +3010,7 @@ msgstr ""
 "@\n"
 "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2890,13 +3040,13 @@ msgstr ""
 " --list-keys [nevek]        kulcsok kiíratása\n"
 " --fingerprint [nevek]      ujjlenyomatok kiíratása\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2911,7 +3061,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:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2919,551 +3069,551 @@ msgstr ""
 "\n"
 "Támogatott algoritmusok:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Nyilvános kulcsú (pubkey): "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Rejtjelező (cipher): "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Kivonatoló (hash): "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Tömörítő (compression): "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "Használat: gpg [opciók] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "Nem találtam = jelet a \"%s\" csoportdefinícióban!\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, 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:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, 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:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 #, 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:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Ez a parancs %s módban nem engedélyezett.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, 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:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 #, 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:3283
+#: g10/gpg.c:3282
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, 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:3517
+#: g10/gpg.c:3511
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, 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:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s és %s nem használható együtt!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s értelmetlen %s mellett!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-nál!\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-nél!\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "Érvénytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZÉS: Egyszerű S2K mód (0) erősen ellenjavallt!\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "Érvénytelen S2K mód; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "Érvénytelen alapértelmezett preferenciák!\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "Érvénytelen személyes kivonatolópreferenciák!\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "Érvénytelen személyes tömörítőpreferenciák!\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, 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:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Vétel a kulcsszerverről sikertelen: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexportálás sikertelen: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, 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:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keresés a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Frissítés a kulcsszerverről sikertelen: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Páncél eltávolítása nem sikerült: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, 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:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti gépelni az üzenetet...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, 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:5492
+#: g10/gpg.c:5490
 #, 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:5525
+#: g10/gpg.c:5523
 #, 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"
@@ -3477,7 +3627,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|�L|állapotinformációk írása �L állományleíróra"
 
@@ -4188,7 +4338,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy továbbra is alá akarja írni? (i/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom aláírni.\n"
 
@@ -4387,8 +4537,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
@@ -4598,7 +4748,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "A kulcsot visszavonták."
 
@@ -4651,7 +4801,7 @@ msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legalább egy kulcsot ki kell választania!\n"
@@ -4738,169 +4888,169 @@ msgstr "Mentsem a változtatásokat? "
 msgid "Quit without saving? (y/N) "
 msgstr "Kilépjek mentés nélkül? "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem változott, nincs szükség frissítésre.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Érvénytelen érték!\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Nincs ilyen felhasználói azonosító.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   aláírva %08lX által %s%s időpontban.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Jellemzők: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 #, fuzzy
 msgid "Notations: "
 msgstr "Jelölés: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nincsenek preferenciák egy PGP 2.x felhasználóazonosítón!\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Ezt a kulcsot a következő %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ezt a kulcsot a következő %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (érzékeny)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozható létre: %s\n"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lejár: %s]"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lejár: %s]"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4908,19 +5058,19 @@ msgstr ""
 "Kérem, vegye figyelembe, hogy az itt látható kulcs érvényessége nem\n"
 "feltétlenül helyes, amíg újra nem indítja a programot!\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4929,18 +5079,18 @@ msgstr ""
 "FIGYELEM: Nincs kijelölt elsődleges felhasználóazonosító. Ez a parancs\n"
 " azt okozhatja, hogy egy másik azonosító lesz elsődlegesként használva.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4950,35 +5100,35 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Továbbra is hozzá akarja adni? (i/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Törli ezt a jó aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Valóban törli ezt az önaláírást? (i/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4986,38 +5136,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Töröltem %d aláírást.\n"
 msgstr[1] "Töröltem %d aláírást.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Nem töröltem semmit.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "invalid"
 msgstr "érvénytelen páncél"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhasználói azonosítót visszavonták."
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "\"%s\" felhasználói azonosítót visszavonták."
 msgstr[1] "\"%s\" felhasználói azonosítót visszavonták."
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5027,224 +5177,224 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Lehet, hogy nem adhat kijelölt visszavonót egy PGP 2.x-stílusú kulcshoz.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�rja be a kijelölt visszavonó felhasználóazonosítóját: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x stílusú kulcsot kijelölt visszavonónak!\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saját kijelölt visszavonójának!\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijelölt visszavonó visszavonta!\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "FIGYELEM: A kijelölt visszavonó kulcs megadása nem csinálható vissza!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Elsődleges kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Elsődleges kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "FIGYELEM: %08lX aláíró alkulcs nem kereszthitelesített.\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 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:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Kihagyom a v3 önaláírást a \"%s\" felhasználóazonosítón.\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Aláírás-jelölés: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Felülírjam (i/N)? "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhasználóazonosító: \""
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az aláírás lejárt %s időpontban.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy mégis visszavonja? (i/N) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 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:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX által %s időpontban.\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "A következő aláírásokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, 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:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, 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:6414
+#: g10/keyedit.c:6470
 #, 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:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5714,7 +5864,7 @@ msgstr ""
 "generátort, hogy entrópiát tudjon gyűjteni.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgenerálás sikertelen: %s\n"
@@ -5785,11 +5935,11 @@ msgstr "Nem írható nyilvánoskulcs-karikát találtam: %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:5213
+#: g10/keygen.c:5210
 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:5229
+#: g10/keygen.c:5226
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5799,38 +5949,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, 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:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, 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:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Valóban létrehozzam? "
@@ -6049,269 +6199,269 @@ msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa méretű (%d) titkosított munkafolyamatkulcs.\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s titkosított munkafolyamatkulcs\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilvános kulcs: %08lX\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilvános kulccsal titkosított adat: jó DEK.\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Titkosítva %u bites %s kulccsal, azonosító: %08lX, létrehozva: %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkosítva %s kulccsal, azonosító: %08lX\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilvános kulcsú visszafejtés sikertelen: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelszóval rejtjelezve\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelszóval rejtjelezve\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkosított adatot feltételezek.\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, 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:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "Visszafejtés rendben.\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkosított üzenetet manipulálták!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti fájlnév: '%.*s'.\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Jó aláírás a következőtől: \""
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ aláírás a következőtől: \""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lejárt aláírás a következőtől: \""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Jó aláírás a következőtől: \""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "Aláírás-ellenőrzés elnyomva.\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, 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:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Aláírva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Kulcs található: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az aláírás lejár: %s.\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "Bináris"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "Szövegmódú"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "Ismeretlen módú"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "ismeretlen nyilvános kulcsú algoritmus"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellenőrizni az aláírást: %s.\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "Nem különálló aláírás.\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, 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:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Régi stílusú (PGP 2.x) aláírás.\n"
@@ -6382,68 +6532,68 @@ msgstr "Olvasási hiba: %s.\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opció: \"%s\"\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Kérem, ezt használja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "tömörítetlen"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "tömörítetlen"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "Lehet, hogy ez az üzenet használhatatlan a %s számára!\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "ismeretlen aláírásosztály"
@@ -6479,24 +6629,24 @@ msgstr "�rok a szabványos kimenetre.\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "Azt feltételezem, hogy az aláírt adat a %s állományban van.\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "Nem tudom kezelni a(z) %d. számú nyilvános kulcsú algoritmust!\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztonságos!\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kritikus aláírás-jelölés: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d típusú alcsomag kritikus bitje beállított.\n"
@@ -6923,12 +7073,12 @@ msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "Nincsenek érvényes címzettek!\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
@@ -7364,7 +7514,7 @@ msgstr ""
 "Kihagytam \"%s\"-t: ez egy PGP által létrehozott ElGamal kulcs, amely nem\n"
 "biztonságos aláírásokhoz!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d típus: írás sikertelen: %s.\n"
@@ -7412,7 +7562,7 @@ msgstr "Hiba bizalmi rekord keresésekor: %s.\n"
 msgid "read error in '%s': %s\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "Bizalmi adatbázis: szinkronizáció sikertelen: %s.\n"
@@ -7921,100 +8071,100 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "\"%s\" nem egy érvényes hosszú kulcsazonosító.\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "%08lX kulcs: Elfogadva megbízható kulcsként.\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "A(z) %08lX kulcs egynél többször szerepel a bizalmi adatbázisban.\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "%08lX kulcs: Nincs nyilvános kulcs a megbízható kulcshoz - kihagytam.\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "A kulcsot alapvetően megbízhatónak jelöltem.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "%lu bizalmi rekord, %d kéréstípus: olvasás sikertelen: %s.\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "%lu bizalmi rekord nem a kért típusú (%d).\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "Nincs szükség a bizalmi adatbázis ellenőrzésére.\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatbázis következő ellenőrzése: %s.\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "Nincs szükség a bizalmi adatbázis ellenőrzésére.\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "Nincs szükség a bizalmi adatbázis ellenőrzésére.\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "A(z) %08lX nyilvános kulcsot nem találom: %s.\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "Ellenőrzöm a bizalmi adatbázist.\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, 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:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8022,45 +8172,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem találtam alapvetően megbízható kulcsot.\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 ""
 
@@ -8072,43 +8222,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 ""
 
@@ -8156,35 +8306,35 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 #, 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "jelszóváltoztatás"
@@ -8252,7 +8402,7 @@ msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 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:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
@@ -8317,7 +8467,7 @@ msgstr ""
 msgid "verify CHV%d failed: %s\n"
 msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
@@ -8463,13 +8613,13 @@ msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem találtam érvényes OpenPGP adatot.\n"
@@ -8486,81 +8636,87 @@ msgstr "jelszóváltoztatás"
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "ne használja a terminált egyáltalán"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:179
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
-msgstr ""
-
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8619,7 +8775,7 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8785,7 +8941,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -8839,7 +8995,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -8850,7 +9006,7 @@ msgstr "nem feldolgozott"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 #, fuzzy
 msgid "none"
 msgstr "nem"
@@ -8887,42 +9043,37 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonosító: %08lX, létrehozva: %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, fuzzy, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
@@ -9116,6 +9267,11 @@ msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "Hiba a jelszó létrehozásakor: %s.\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9194,134 +9350,134 @@ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 msgid "no valid recipients given\n"
 msgstr "(Nincs leírás.)\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 #, fuzzy
 msgid "list external keys"
 msgstr "titkos kulcsok listázása"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 #, fuzzy
 msgid "list certificate chain"
 msgstr "rossz igazolás"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "import certificates"
 msgstr "rossz igazolás"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 #, fuzzy
 msgid "export certificates"
 msgstr "rossz igazolás"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:258
-#, fuzzy
-msgid "create base-64 encoded output"
-msgstr "ascii páncélozott kimenet létrehozása"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "ne használja a terminált egyáltalán"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:278
-msgid "never consult a CRL"
-msgstr ""
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "ascii páncélozott kimenet létrehozása"
 
-#: sm/gpgsm.c:288
-msgid "check validity using OCSP"
-msgstr ""
+#: sm/gpgsm.c:330
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr ""
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "kulcskarika hozzáadása a kulcskarikalistához"
 
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:299
-msgid "do not check certificate policies"
+#: sm/gpgsm.c:354
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NÉV|NÉV rejtjelező algoritmus haszn. jelszavakhoz"
+
+#: sm/gpgsm.c:372
+msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "ne használja a terminált egyáltalán"
+#: sm/gpgsm.c:380
+msgid "check validity using OCSP"
+msgstr ""
 
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:382
+msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
-#, fuzzy
-msgid "|FILE|write an audit log to FILE"
-msgstr "|fájl|bővítő modul betöltése"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NÉV|NÉV rejtjelező algoritmus használata"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NÉV|NÉV kivonatoló algoritmus használata"
+
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "kötegelt mód: soha nem kérdez"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "igen válasz feltételezése a legtöbb kérdésre"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "nem válasz feltételezése a legtöbb kérdésre"
 
-#: sm/gpgsm.c:329
+#: sm/gpgsm.c:418
 #, fuzzy
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "kulcskarika hozzáadása a kulcskarikalistához"
-
-#: sm/gpgsm.c:332
-#, fuzzy
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-#, 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:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NÉV|NÉV rejtjelező algoritmus használata"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NÉV|NÉV kivonatoló algoritmus használata"
+msgid "|FILE|write an audit log to FILE"
+msgstr "|fájl|bővítő modul betöltése"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9332,27 +9488,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:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "�rok a \"%s\" állományba.\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, 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:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9412,7 +9568,7 @@ msgstr "rev? Nem tudom ellenőrizni a visszavonást: %s.\n"
 msgid "error storing flags: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr ""
 
@@ -9442,7 +9598,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9487,23 +9643,23 @@ msgstr ""
 msgid "algorithm:"
 msgstr "Páncél: %s\n"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Jó aláírás a következőtől: \""
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "               azaz \""
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -10300,116 +10456,140 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-msgid "run without asking a user"
-msgstr "Kilépjek mentés nélkül? "
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:242
+#, fuzzy
+msgid "|URL|use keyserver at URL"
+msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|GÉPNÉV|kulcsszerver beállítása kulcsok kereséséhez"
+
+#: dirmngr/dirmngr.c:271
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:227
-#, fuzzy
-msgid "|URL|use OCSP responder at URL"
-msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr ""
 
-#: dirmngr/dirmngr.c:229
-msgid "|FPR|OCSP response signed by FPR"
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+#: dirmngr/dirmngr.c:285
+#, fuzzy
+msgid "|URL|use OCSP responder at URL"
+msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
+
+#: dirmngr/dirmngr.c:287
+msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10422,95 +10602,95 @@ msgstr ""
 "@\n"
 "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "Használat: gpg [opciók] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "A sor túl hosszú!\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "nem feldolgozott"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -10703,93 +10883,93 @@ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 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:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, 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:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10799,68 +10979,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, 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:2977
+#: dirmngr/server.c:2984
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10906,7 +11086,7 @@ msgstr "%c%lu preferencia kétszer szerepel!\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 #, fuzzy
 msgid "quiet"
 msgstr "kilépés|kilepes"
@@ -11000,308 +11180,157 @@ msgstr "Aláírás sikertelen: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr ""
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr ""
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr ""
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-
-#: tools/gpgconf-comp.c:588
-#, fuzzy
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|N. sorszámú jelszómód használata"
-
-#: tools/gpgconf-comp.c:592
-#, fuzzy
-msgid "do not allow the reuse of old passphrases"
-msgstr "Hiba a jelszó létrehozásakor: %s.\n"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-#, fuzzy
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NÉV|titkosítás NÉV részére"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-#, fuzzy
-msgid "|URL|use keyserver at URL"
-msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "kulcsok importálása kulcsszerverről"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-msgid "include the public key in signatures"
-msgstr "kulcsaláírások ellenőrzése"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr ""
-
-#: tools/gpgconf-comp.c:838
-#, fuzzy
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NÉV|NÉV rejtjelező algoritmus haszn. jelszavakhoz"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr ""
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr ""
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "hálózati hiba"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "rossz jelszó"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "nyilvános kulcs nem található"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "list global configuration file"
 msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 #, fuzzy
 msgid "check global configuration file"
 msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "bizalmi adatbázis frissítése"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "kimeneti állomány megadása"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 #, fuzzy
 msgid "Component not found"
 msgstr "nyilvános kulcs nem található"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 #, fuzzy
 msgid "No argument allowed"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
@@ -11318,6 +11347,27 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "�rok a \"%s\" állományba.\n"
+
+#, fuzzy
+#~ msgid "use a log file for the server"
+#~ msgstr "kulcsok keresése kulcsszerveren"
+
+#, fuzzy
+#~ msgid "run without asking a user"
+#~ msgstr "Kilépjek mentés nélkül? "
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "kulcsok importálása kulcsszerverről"
+
+#, fuzzy
+#~ msgid "include the public key in signatures"
+#~ msgstr "kulcsaláírások ellenőrzése"
+
+#, fuzzy
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
@@ -11457,10 +11507,6 @@ msgstr ""
 #~ msgstr "Nem tudom megnyitni %s-t: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
-
-#, fuzzy
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
@@ -13197,9 +13243,6 @@ msgstr ""
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "soha ne használjon MDC-t titkosításkor"
 
-#~ msgid "use the gpg-agent"
-#~ msgstr "gpg ügynök használata"
-
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[fájl]|állapotinformációk állományba írása"
 
diff --git a/po/id.po b/po/id.po
index 62a47aa..704d886 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -138,8 +138,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr ""
 
@@ -189,13 +189,47 @@ msgstr "MPI yang buruk"
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "ubah passphrase"
+
+#: agent/command.c:2423
+#, 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:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -203,189 +237,172 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 msgid "can't create '%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, fuzzy, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "kesalahan penciptaan passphrase: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "ubah passphrase"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Ulangi passphrase: "
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Ulangi passphrase: "
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ulangi passphrase: "
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "kesalahan penciptaan passphrase: %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "menulis ke `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Masukkan passphrase\n"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Tetap gunakan kunci ini? "
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, 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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -393,7 +410,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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -401,314 +418,391 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-#, fuzzy
-msgid ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
 msgstr ""
-"@\n"
-"Pilihan:\n"
-"  "
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Kunci dilampaui"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "detil"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "lebih diam"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:192
-#, fuzzy
-msgid "use a log file for the server"
-msgstr "cari kunci di keyserver"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "detil"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "lebih diam"
+
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "tidak didukung"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "tidak didukung"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
 #: agent/gpg-agent.c:244
-msgid "do not use the PIN cache when signing"
+msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:248
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:250
 #, 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:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:258
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:276
 #, fuzzy
-#| msgid "not supported"
-msgid "enable ssh support"
-msgstr "tidak didukung"
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|gunakan passphrase mode N"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:278
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:283
 #, fuzzy
-#| msgid "not supported"
-msgid "enable putty support"
-msgstr "tidak didukung"
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "gunakan gpg-agent"
+
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Pilihan:\n"
+"  "
+
 #: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -720,8 +814,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -729,9 +823,8 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -785,43 +878,43 @@ msgstr "Batal"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -834,19 +927,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "y|ya"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -859,7 +952,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -869,48 +962,48 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 #, fuzzy
 msgid "Change passphrase"
 msgstr "ubah passphrase"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 msgid "Delete key"
 msgstr "aktifkan kunci"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -941,7 +1034,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -959,52 +1052,52 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
@@ -1035,12 +1128,12 @@ msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
@@ -1101,22 +1194,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1456,7 +1549,7 @@ msgstr "opsi impor tidak valid\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opsi impor tidak valid\n"
@@ -1486,19 +1579,19 @@ msgstr ""
 msgid "invalid option \"%.50s\"\n"
 msgstr "opsi impor tidak valid\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1518,41 +1611,41 @@ msgstr "tidak dapat membuka file: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1792,23 +1885,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
 
-#: g10/card-util.c:91 g10/card-util.c:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
@@ -1824,8 +1917,8 @@ msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1835,230 +1928,230 @@ msgstr "Pilihan anda? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: g10/card-util.c:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2066,184 +2159,184 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2306,8 +2399,8 @@ msgid "subkey"
 msgstr "Pubkey: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
@@ -2347,27 +2440,27 @@ msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
 msgid "using cipher %s\n"
 msgstr "menggunakan cipher %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2390,47 +2483,53 @@ msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "masalah menangani paket terenkripsi\n"
@@ -2627,235 +2726,286 @@ msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 #, fuzzy
 msgid "make a signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ubah passphrase"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "ekspor kunci ke keyserver"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "impor kunci dari keyserver"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "cari kunci di keyserver"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
-msgid "create ascii armored output"
-msgstr "ciptakan output ascii"
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
+#: g10/gpg.c:596 sm/gpgsm.c:332
 #, fuzzy
-msgid "|USER-ID|encrypt for USER-ID"
+msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "jangan buat perubahan"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "tanya sebelum menimpa"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr ""
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr ""
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
+msgid "create ascii armored output"
+msgstr "ciptakan output ascii"
+
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
 #, fuzzy
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "gunakan id-user ini untuk menandai/dekripsi"
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "gunakan mode teks kanonikal"
+
+#: g10/gpg.c:743
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "gunakan mode teks kanonikal"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr ""
+
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr ""
+
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr ""
+
+#: g10/gpg.c:803 sm/gpgsm.c:324
 #, fuzzy
-msgid "|FILE|write output to FILE"
-msgstr "|FILE|muat modul ekstensi FILE"
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "jangan buat perubahan"
+#: g10/gpg.c:805 sm/gpgsm.c:326
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "tanya sebelum menimpa"
+#: g10/gpg.c:813 sm/gpgsm.c:328
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2863,7 +3013,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2893,13 +3043,13 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2914,7 +3064,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2922,553 +3072,553 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, 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:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, 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:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, 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:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, 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:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -3482,7 +3632,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
@@ -4190,7 +4340,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
@@ -4392,8 +4542,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -4603,7 +4753,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
@@ -4656,7 +4806,7 @@ msgstr "Hapus ID user ini? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
@@ -4743,169 +4893,169 @@ msgstr "Simpan perubahan? "
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4913,19 +5063,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4934,18 +5084,18 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4955,35 +5105,35 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4991,38 +5141,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Menghapus %d signature.\n"
 msgstr[1] "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User ID \"%s\" dibatalkan."
 msgstr[1] "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5032,46 +5182,46 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
 "dilakukan\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5079,181 +5229,181 @@ msgid ""
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5724,7 +5874,7 @@ msgstr ""
 "yang baik untuk memperoleh entropi.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
@@ -5795,11 +5945,11 @@ msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5809,37 +5959,37 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, 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:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, 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:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keygen.c:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
@@ -6056,268 +6206,268 @@ msgstr "meminta kunci %08lX dari %s\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kunci sesi enkripsi\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritma pubkey tidak dikenal"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
@@ -6384,68 +6534,68 @@ msgstr "kesalahan pembacaan: %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "kelas signature tidak dikenal"
@@ -6481,23 +6631,23 @@ msgstr "menulis ke stdout\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notasi signature kritis: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -6923,12 +7073,12 @@ msgstr "penerima baku tidak dikenal `%s'\n"
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
@@ -7363,7 +7513,7 @@ msgstr ""
 "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
 "untuk signature!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -7411,7 +7561,7 @@ msgstr "kesalahan: gagal menemukan catatan trust: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
@@ -7920,99 +8070,99 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' bukanlah keyID panjang yang valid\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kunci %08lX muncul lebih dari satu kali dalam trustdb\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "kunci %08lX: tidak ada kunci publik untuk trusted key- dilewati\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "kunci ditandai sebagai sangat dipercaya.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, 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:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8020,45 +8170,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 ""
 
@@ -8070,43 +8220,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 ""
 
@@ -8154,35 +8304,35 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 #, 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "ubah passphrase"
@@ -8250,7 +8400,7 @@ msgstr "gagal inisialisasi TrustDB: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
@@ -8315,7 +8465,7 @@ msgstr ""
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
@@ -8461,13 +8611,13 @@ msgstr "%s signature, algoritma digest %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -8484,81 +8634,87 @@ msgstr "ubah passphrase"
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "jangan menggunakan terminal"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:179
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "perintah saling konflik\n"
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
-msgstr ""
-
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8617,7 +8773,7 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8783,7 +8939,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -8837,7 +8993,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -8848,7 +9004,7 @@ msgstr "tidak diproses"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 #, fuzzy
 msgid "none"
 msgstr "n|t|tidak"
@@ -8884,42 +9040,37 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, fuzzy, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
@@ -9114,6 +9265,11 @@ msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9192,134 +9348,134 @@ msgstr "gagal menghapus keyblok: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 #, fuzzy
 msgid "list external keys"
 msgstr "tampilkan kunci rahasia"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 #, fuzzy
 msgid "list certificate chain"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "import certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 #, fuzzy
 msgid "export certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:258
-#, fuzzy
-msgid "create base-64 encoded output"
-msgstr "ciptakan output ascii"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "jangan menggunakan terminal"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:278
-msgid "never consult a CRL"
-msgstr ""
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "ciptakan output ascii"
 
-#: sm/gpgsm.c:288
-msgid "check validity using OCSP"
-msgstr ""
+#: sm/gpgsm.c:330
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr ""
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "tambah keyring ini ke daftar keyring"
 
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:299
-msgid "do not check certificate policies"
+#: sm/gpgsm.c:354
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
+
+#: sm/gpgsm.c:372
+msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "jangan menggunakan terminal"
+#: sm/gpgsm.c:380
+msgid "check validity using OCSP"
+msgstr ""
 
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:382
+msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
-#, fuzzy
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FILE|muat modul ekstensi FILE"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
+
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:329
+#: sm/gpgsm.c:418
 #, fuzzy
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "tambah keyring ini ke daftar keyring"
-
-#: sm/gpgsm.c:332
-#, fuzzy
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-#, fuzzy
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAMA|gunakan algoritma cipher NAMA"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|muat modul ekstensi FILE"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9330,27 +9486,27 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9410,7 +9566,7 @@ msgstr "rev? masalah memeriksa pembatalan: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr ""
 
@@ -9440,7 +9596,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9485,23 +9641,23 @@ msgstr ""
 msgid "algorithm:"
 msgstr "armor: %s\n"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Signature baik dari \""
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "              alias \""
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -10298,116 +10454,140 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-msgid "run without asking a user"
-msgstr "Berhenti tanpa menyimpan? "
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:242
+#, fuzzy
+msgid "|URL|use keyserver at URL"
+msgstr "tidak dapat memparsing URI keyserver\n"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
+
+#: dirmngr/dirmngr.c:271
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:227
-#, fuzzy
-msgid "|URL|use OCSP responder at URL"
-msgstr "tidak dapat memparsing URI keyserver\n"
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr ""
 
-#: dirmngr/dirmngr.c:229
-msgid "|FPR|OCSP response signed by FPR"
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+#: dirmngr/dirmngr.c:285
+#, fuzzy
+msgid "|URL|use OCSP responder at URL"
+msgstr "tidak dapat memparsing URI keyserver\n"
+
+#: dirmngr/dirmngr.c:287
+msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10420,95 +10600,95 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "tidak diproses"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -10701,93 +10881,93 @@ msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 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:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "buat sertifikat revokasi"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, 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:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10797,68 +10977,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: dirmngr/server.c:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10904,7 +11084,7 @@ msgstr "preferensi %c%lu ganda \n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 #, fuzzy
 msgid "quiet"
 msgstr "q|k|keluar"
@@ -10998,308 +11178,157 @@ msgstr "gagal menandai: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr ""
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr ""
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr ""
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-
-#: tools/gpgconf-comp.c:588
-#, fuzzy
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|gunakan passphrase mode N"
-
-#: tools/gpgconf-comp.c:592
-#, fuzzy
-msgid "do not allow the reuse of old passphrases"
-msgstr "kesalahan penciptaan passphrase: %s\n"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-#, fuzzy
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAMA|enkripsi untuk NAMA"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-#, fuzzy
-msgid "|URL|use keyserver at URL"
-msgstr "tidak dapat memparsing URI keyserver\n"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "impor kunci dari keyserver"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-msgid "include the public key in signatures"
-msgstr "periksa signature kunci"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr ""
-
-#: tools/gpgconf-comp.c:838
-#, fuzzy
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr ""
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr ""
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "kesalahan jaringan"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "passphrase yang buruk"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "kunci publik tidak ditemukan"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "list global configuration file"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 #, fuzzy
 msgid "check global configuration file"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "perbarui database trust"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 #, fuzzy
 msgid "Component not found"
 msgstr "kunci publik tidak ditemukan"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 #, fuzzy
 msgid "No argument allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
@@ -11316,6 +11345,27 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "menulis ke `%s'\n"
+
+#, fuzzy
+#~ msgid "use a log file for the server"
+#~ msgstr "cari kunci di keyserver"
+
+#, fuzzy
+#~ msgid "run without asking a user"
+#~ msgstr "Berhenti tanpa menyimpan? "
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "impor kunci dari keyserver"
+
+#, fuzzy
+#~ msgid "include the public key in signatures"
+#~ msgstr "periksa signature kunci"
+
+#, fuzzy
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "meminta kunci %08lX dari %s\n"
 
@@ -11455,10 +11505,6 @@ msgstr ""
 #~ msgstr "tidak dapat membuka %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "kesalahan menulis keyring `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "kesalahan membaca `%s': %s\n"
 
@@ -13196,9 +13242,6 @@ msgstr ""
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "jangan gunakan MDC untuk enkripsi"
 
-#~ msgid "use the gpg-agent"
-#~ msgstr "gunakan gpg-agent"
-
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[file]|tulis status info ke file"
 
diff --git a/po/it.gmo b/po/it.gmo
index bbb1967..27ecf7e 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index d4144a6..80294c5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.2.23\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+0200\n"
 "PO-Revision-Date: 2021-05-19 00:03+0200\n"
 "Last-Translator: Denis <student@alice.it>\n"
 "Language-Team: \n"
@@ -136,8 +136,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "non corrisponde - riprova"
 
@@ -182,62 +182,93 @@ msgstr "PIN non valido"
 msgid "Bad Passphrase"
 msgstr "Passphrase non valido"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, 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:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Inserisci di nuovo questa passphrase"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase to protect the imported object within the "
+#| "GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Immettere la passphrase per proteggere l'oggetto importato all'interno del "
+"sistema GnuPG."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "le chiavi ssh maggiori di %d bit non sono supportate\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "impossibile creare '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "impossibile aprire '%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, 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-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "scheda rilevata con S/N: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "nessuna chiave di autenticazione per ssh sulla scheda: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nessuna chiave della scheda adatta trovata: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "errore durante il recupero dell'elenco delle schede: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -246,24 +277,20 @@ msgstr ""
 "Un processo ssh ha richiesto l'utilizzo della chiave%%0A  %s%%0A  (%s)%%0ASi "
 "desidera consentire questa operazione?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "Permettere"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "Rifiutare"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Immettere la passphrase per la chiave ssh%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Inserisci di nuovo questa passphrase"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -272,96 +299,92 @@ msgstr ""
 "Immettere una passphrase per proteggere la chiave segreta ricevuta%%0A %s"
 "%%0A %s%%0A all'interno dell'archivio chiavi dell'agente gpg"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "impossibile creare il flusso dal socket: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "Inserire la scheda con il numero di serie"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "Rimuovere la carta corrente e inserire quella con il numero di serie"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "PIN amministratore"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Resetta codice"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr "Premere il pulsante ACK sulla scheda/token."
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr "Utilizzare il pinpad del lettore per l'input."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Ripeti questo codice di reimpostazione"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "Ripeti questo PUK"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Ripeti questo PIN"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Reimpostare il codice non ripetuto correttamente; Riprova"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK non ripetuto correttamente; Riprova"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN non ripetuto correttamente; Riprova"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Immettere il PIN%s%s%s per sbloccare la scheda"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "errore durante la creazione del file temporaneo: %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "errore durante la scrittura nel file temporaneo: %s\n"
+#: agent/genkey.c:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "errore durante la scrittura in %s: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Inserisci la nuova passphrase"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "Prendi questo comunque"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, 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:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -371,18 +394,18 @@ msgstr ""
 "prega di confermare che non si desidera disporre di alcuna protezione sulla "
 "chiave."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Sì, la protezione non è necessaria"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, 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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -392,160 +415,230 @@ msgstr[0] ""
 msgstr[1] ""
 "Una passphrase deve contenere almeno %u cifre o%%0Acaratteri speciali."
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, 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:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Avviso: è stata immessa una passphrase non sicura."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Immettere la passphrase a%0Aproteggere la nuova chiave"
 
-#: agent/genkey.c:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Inserisci la nuova passphrase"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Optioni:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+#, fuzzy
+#| msgid "Options useful for debugging"
+msgid "Options used for startup"
+msgstr "Opzioni utili per il debug"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "eseguire in modalità daemon (sfondo)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "eseguire in modalità server (in primo piano)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr "eseguire in modalità supervisionata"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "prolisso"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "meno prolisso"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "non scollegarsi dalla console"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "uscita del comando sh-stile"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "uscita del comando in csh-stile"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|opzioni di lettura da FILE"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "non scollegarsi dalla console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Opzioni che controllano l'output diagnostico"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "utilizzare un file di registro per il server"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "prolisso"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "| PGM|utilizzare PGM come programma PIN-Entry"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "| PGM| utilizzare PGM come programma SCdaemon"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|scrittura dei registri in modalità server in FILE"
+
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Opzioni che controllano la configurazione"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "non utilizzare il SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "| PGM| utilizzare PGM come programma SCdaemon"
+
+#: agent/gpg-agent.c:213
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accettare alcuni comandi tramite NAME"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorare le richieste di modifica del TTY"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorare le richieste di modifica della visualizzazione X"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "abilitare il supporto ssh"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|ALGO|usa ALGO per mostrare le impronte digitali ssh"
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "abilitare il supporto putty"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Opzioni che controllano la sicurezza"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|scadenza PIN memorizzati nella cache dopo N secondi"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|Chiavi SSH di N-scadenza dopo N secondi"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|imposta la durata massima della cache del PIN su N secondi"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set durata massima del tasto SSH su N secondi"
+
+#: agent/gpg-agent.c:248
 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:250
 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:252
 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:257
 msgid "allow presetting passphrase"
 msgstr "consentire la preimpostazione della passphrase"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Opzioni che applicano un criterio di passphrase"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "non consentire l'esclusione dei criteri di passphrase"
+
+#: agent/gpg-agent.c:267
+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:269
+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:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE||controlla le nuove passphrase rispetto al modello in FILE"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "| La passphrase dopo N giorni"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "non consentono il riutilizzo di vecchie passphrase"
+
+#: agent/gpg-agent.c:281
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the PIN-Entry"
+msgstr "Opzioni che controllano la sicurezza"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
+msgstr ""
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr "non consentire al chiamante di eseguire l'override del pinentry"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
-msgstr "consentire la passphrase tramite Emacs"
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
 
-#: agent/gpg-agent.c:258
-msgid "enable ssh support"
-msgstr "abilitare il supporto ssh"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "| PGM|utilizzare PGM come programma PIN-Entry"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "|ALGO|usa ALGO per mostrare le impronte digitali ssh"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|Il timeout di Pinentry è impostato su N secondi"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "abilitare il supporto putty"
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Segnalare i bug a <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Utilizzo: @GPG_AGENT@ [opzioni] (-h per assistenza)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -553,135 +646,143 @@ msgstr ""
 "Sintassi: @GPG_AGENT@ [opzioni] [comando [args]]\n"
 "Gestione delle chiavi segrete per @GNUPG@\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "'%s' a livello di debug non valido specificato\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "opzioni di lettura da '%s'\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Nota: '%s' non è considerato un'opzione\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare il socket: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "il nome socket '%s' è troppo lungo\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, 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:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, 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:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "impossibile impostare le autorizzazioni di '%s': %s\n"
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "ascolto sul socket '%s'\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "impossibile creare la directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory '%s' creata\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() non riuscito per '%s': %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "impossibile utilizzare '%s' come home directory\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, 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:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "gestore 0x%lx per fd %d avviato\n"
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "gestore 0x%lx per fd %d terminato\n"
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, 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:2824
+#: agent/gpg-agent.c:2806
 #, 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:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect non riuscito: %s - 1s in attesa\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s arrestato\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "nessun gpg-agent in esecuzione in questa sessione\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Optioni:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)\n"
@@ -694,8 +795,8 @@ msgstr ""
 "Sintassi: gpg-preset-passphrase [opzioni] KEYGRIP\n"
 "Manutenzione della cache delle password\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -703,9 +804,8 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -762,43 +862,43 @@ msgstr "annullato\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "errore durante la richiesta della passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "errore durante l'apertura di '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "file '%s', riga %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "istruzione \"%s\" ignorata in '%s', riga %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "elenco di attendibilità del sistema '%s' non disponibile\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "impronta digitale non valido in '%s', riga %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "keyflag non valido in '%s', riga %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "errore durante la lettura di '%s', riga %d: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -812,7 +912,7 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -821,11 +921,11 @@ msgstr ""
 "Alla fine ti fidi di %% 0A \"% s\" %%0Aper certificare correttamente i "
 "certificati utente?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Sì"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -838,7 +938,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -850,22 +950,22 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "Corretto"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "Sbagliato"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Nota: questa passphrase non è mai stata modificata.%0ASi prega di cambiarlo "
 "ora."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -874,15 +974,15 @@ msgstr ""
 "Questa passphrase non è stata modificata%%0Ada %.4s-%.2s-%.2s.  Si prega di "
 "cambiarlo ora."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Modifica passphrase"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "Lo cambierò più tardi"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -890,11 +990,11 @@ msgid ""
 msgstr ""
 "Si desidera eliminare la chiave identificata da keygrip%%0A %s%%0A %%C%%0A?"
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "Elimina chiave"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -928,7 +1028,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "l'algoritmo a chiave pubblica %d (%s) non è supportato\n"
@@ -943,52 +1043,52 @@ msgstr "algoritmo di protezione %d (%s) non supportato\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "algoritmo hash di protezione %d (%s) non supportato\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "errore durante la creazione di una pipe: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "errore durante la creazione di un flusso per una pipe: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "errore durante il processo di forking: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "in attesa della terminazione del processo %d non riuscita: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "errore durante l'esecuzione di '%s': probabilmente non installato\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "errore durante l'esecuzione di '%s': stato di uscita %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "errore durante l'esecuzione di '%s': terminato\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "attesa della terminazione dei processi non riuscita: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "errore durante l'osando di fine del processo %d: %s\n"
@@ -1018,12 +1118,12 @@ msgstr "Avviso: proprietà non sicura su %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Avviso: autorizzazioni non sicure su %s \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "in attesa che il file '%s' diventi accessibile …\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "ridenominazione di '%s' in '%s' non riuscita: %s\n"
@@ -1084,22 +1184,22 @@ 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:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "errore durante l'allocazione di memoria sufficiente: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: opzione obsoleta \"%s\" - non ha effetto\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "AVVISO: \"%s%s\" è un'opzione obsoleta - non ha alcun effetto\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "flag di debug sconosciuto '%s' ignorato\n"
@@ -1405,7 +1505,7 @@ msgstr "opzione non valida"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "argomento mancante per l'opzione \"%.50s\"\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argomento non valido per l'opzione \"%.50s\"\n"
@@ -1435,17 +1535,17 @@ msgstr "il comando \"%.50s\" è ambiguo\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "opzione non valida \"%.50s\"\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "Nota: nessun file di opzioni predefinito '%s'\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "file di opzioni '%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1465,41 +1565,41 @@ msgstr "iconv_open non riuscito: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "conversione da '%s' a '%s' non riuscita: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "impossibile creare il file temporaneo '%s': %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "errore durante la scrittura in '%s': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "rimozione del file di blocco non più utilizzato (creato da %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "in attesa di blocco (in attesa di %d%s) %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(deadlock?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "blocco '%s' non effettuato: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "attesa del blocco %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s è troppo vecchio (è necessario %s, con %s)\n"
@@ -1727,22 +1827,22 @@ msgstr "il reindirizzamento HTTP dal server è stato pulito"
 msgid "server uses an invalid certificate"
 msgstr "server utilizza un certificato non valido"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, c-format
 msgid "Note: %s\n"
 msgstr "Nota: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, 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:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1758,8 +1858,8 @@ msgstr "Questo comando è disponibile solo per le schede della versione 2\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1769,121 +1869,121 @@ msgstr "Cosa scegli? "
 msgid "[not set]"
 msgstr "[non impostato]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr "Sig."
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr "Sig.ra."
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "non forzato"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "costretto"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Errore: al momento è consentito solo ASCII semplice.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Errore: il carattere \"<\" non può essere utilizzato.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Errore: gli spazi doppi non sono consentiti.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Cognome del titolare della carta: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Nome del titolare della carta: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "URL per recuperare la chiave pubblica: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "errore durante la lettura di '%s': %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "errore durante la scrittura di '%s': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Dati di accesso (nome account): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Dati DO privati: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Preferenze lingua: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Errore: lunghezza della stringa di preferenza non valida.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Errore: caratteri non validi nella stringa di preferenza.\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Salutazione (M - Mr., F - Ms., o spazio): "
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "|FPR|Risposta OCSP firmata da FPR\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "Impronta digitale CA: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Errore: impronta digitale formattata non valida.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operazione chiave non possibile: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "non una scheda OpenPGP"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Sostituire la chiave esistente? (y/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1895,102 +1995,102 @@ msgstr ""
 "      documentazione della carta per vedere quali dimensioni sono "
 "consentite.\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Che chiave vuoi? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s keysizes deve essere compreso nell'intervallo %u-%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr "Modifica dell'attributo chiave della scheda per: "
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 msgid "Signature key\n"
 msgstr "Chiave di firma\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 msgid "Encryption key\n"
 msgstr "Chiave di crittografia\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr "Chiave di autenticazione\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "errore durante il recupero delle informazioni sulla scheda: %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 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:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Sostituire le chiavi esistenti? (y/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2001,166 +2101,166 @@ msgstr ""
 "   PIN : '%s'     PIN di amministrazione = '%s'\n"
 "È necessario modificarli utilizzando il comando --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 msgid "Please select the type of key to generate:\n"
 msgstr "Selezionare il tipo di chiave da generare:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Chiave di firma\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Chiave di crittografia\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Chiave di autenticazione\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "Si prega di selezionare dove memorizzare la chiave:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD non riuscito: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr "Continuare? (Y/n) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Fare davvero un reset di fabbrica? (immettere \"sì\") "
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "errore per l'installazione KDF: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "abbandona questo menù"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "mostra comandi di amministrazione"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "elencare tutti i dati disponibili"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "cambiare il nome del titolare della carta"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "modificare l'URL per recuperare la chiave"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "recuperare la chiave specificata nell'URL della scheda"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "modificare il nome di accesso"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "modificare le preferenze della lingua"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr "cambiare il saluto del titolare della carta"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "modificare un'impronta digitale CA"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "attivare/disattivare il flag PIN di forza della firma"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "genera nuove chiavi"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "per modificare o sbloccare il PIN"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "verificare il PIN ed elencare tutti i dati"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "sbloccare il PIN utilizzando un codice di ripristino"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr "distruggere tutte le chiavi e i dati"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr "configurazione KDF per l'autenticazione PIN"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 msgid "change the key attribute"
 msgstr "modificare l'attributo chiave"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "Comando solo amministratore\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "I comandi di amministrazione sono consentiti\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "I comandi di amministrazione non sono consentiti\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "impossibile aprire '%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave \"%s\" non trovata: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2224,8 +2324,8 @@ msgid "subkey"
 msgstr "sottochiave"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
@@ -2266,25 +2366,25 @@ msgstr ""
 msgid "using cipher %s\n"
 msgstr "uso il cifrario %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' già compresso\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "AVVISO: '%s' è un file vuoto\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "l'algoritmo di crittografia '%s' non può essere utilizzato in modalità %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "l'algoritmo digest '%s' non può essere utilizzato in modalità %s\n"
@@ -2307,7 +2407,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVVISO: la chiave %s non è adatta per la crittografia in modalità %s\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2316,34 +2422,34 @@ msgstr ""
 "AVVISO: l'algoritmo di compressione %s (%d) viola le preferenze dei "
 "destinatari\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "l'opzione '%s' non può essere utilizzata in modalità %s\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2351,7 +2457,7 @@ msgstr ""
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problema nella gestione del pacchetto cifrato\n"
@@ -2535,214 +2641,274 @@ msgstr "Chiave non valida %s resa valida da --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "utilizzando la sottochiave %s anziché la chiave primaria %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valori validi per l'opzione '%s':\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "fare una firma"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "creare una firma di testo non crittografato"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "elencare e controllare le firme delle chiavi"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "generare rapidamente una nuova coppia di chiavi"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr "aggiungere rapidamente un nuovo id utente"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr "revocare rapidamente un id utente"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr "impostare rapidamente una nuova data di scadenza"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "generazione completa della coppia di chiavi in primo piano"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "firmare rapidamente un tasto"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "firmare rapidamente una chiave localmente"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "revocare rapidamente un id utente"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "esporta le chiavi a un keyserver"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importa le chiavi da un keyserver"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "cerca delle chiavi su un keyserver"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un keyserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "stampare lo stato della scheda"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "modificare i dati su una scheda"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "modificare il PIN di una carta"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "stampare digest dei messaggi"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "eseguire in modalità server"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALORE|impostare il criterio TOFU per una chiave"
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|usa NAME come chiave segreta predefinita"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "Anche nome-crittografare all'ID utente NOME"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|configurare gli alias di posta elettronica"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "utilizzare un comportamento OpenPGP rigoroso"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "non fa cambiamenti"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "chiede prima di sovrascrivere"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the input"
+msgstr "Opzioni che controllano la sicurezza"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+#, fuzzy
+#| msgid "Options controlling the diagnostic output"
+msgid "Options controlling the output"
+msgstr "Opzioni che controllano l'output diagnostico"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|USER-ID|encrypt per USER-ID"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|scrittura dell'output in FILE"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|USER-ID|utilizzare USER-ID per firmare o decrittografare"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|Impostare il livello di compressione su N (0 disabilita)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "usa il modo testo canonico"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+#, fuzzy
+#| msgid "Options controlling the interactivity and enforcement"
+msgid "Options controlling key import and export"
+msgstr "Opzioni che controllano l'interattività e l'applicazione"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|FILE|scrittura dell'output in FILE"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
+"|MECHANISMS|utilizzare MECHANISMS per individuare le chiavi in base "
+"all'indirizzo di posta elettronica"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "non fa cambiamenti"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "disabilitare tutti gli accessi al dirmngr"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "chiede prima di sovrascrivere"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+#, fuzzy
+#| msgid "Options controlling the configuration"
+msgid "Options controlling key listings"
+msgstr "Opzioni che controllano la configurazione"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "utilizzare un comportamento OpenPGP rigoroso"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt per USER-ID"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|utilizzare USER-ID per firmare o decrittografare"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2750,7 +2916,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2770,11 +2936,11 @@ msgstr ""
 " --list-keys [nomi]       mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Utilizzo: @GPG@ [opzioni] [file] (-h per assistenza)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2784,7 +2950,7 @@ msgstr ""
 "Firmare, controllare, crittografare o decrittografare\n"
 "Il funzionamento predefinito dipende dai dati di input\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2792,73 +2958,73 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "utilizzo: %s [opzioni] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "nessun segno = trovato nella definizione di gruppo '%s'\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, 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:1630
+#: g10/gpg.c:1656
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVVISO: proprietà non sicura nell'estensione '%s'\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVVISO: autorizzazioni non sicure per l'estensione '%s'\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2866,21 +3032,21 @@ msgstr ""
 "AVVISO: proprietà della directory di inclusione non sicura nel file di "
 "configurazione '%s'\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2888,463 +3054,463 @@ msgstr ""
 "AVVISO: autorizzazioni della directory di inclusione non sicure nella "
 "directory homedir '%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "elemento di configurazione sconosciuto '%s'\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "visualizzare gli ID foto durante le elenchi dei tasti"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr ""
 "mostra le informazioni sull'utilizzo delle chiavi durante le inserzioni "
 "chiave"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "mostra URL dei criteri durante gli elenchi delle firme"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "mostra tutte le notazioni durante gli elenchi delle firme"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "mostra notazioni standard IETF durante gli elenchi delle firme"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "mostra le notazioni fornite dall'utente durante gli elenchi delle firme"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostra gli URL preferiti del keyserver durante gli elenchi delle firme"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "mostra validità ID utente durante le inserzioni chiave"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostra ID utente revocati e scaduti negli elenchi di chiavi"
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostra sottochiavi revocate e scadute negli elenchi di chiavi"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "mostrare il nome del keyring negli elenchi delle chiavi"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "mostra date di scadenza durante le inserzioni delle firme"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "criterio TOFU sconosciuto '%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(utilizzare \"help\" per elencare le scelte)\n"
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non è permesso in modalità %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Nota: %s non è per uso normale!\n"
 
-#: g10/gpg.c:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' non è una scadenza di firma valida\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" non è un indirizzo di posta elettronica corretto\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "modalità pinentry non valida '%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "origine richiesta non valida '%s'\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' non è un set di caratteri valido\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile analizzare l'URL del server dei chiavi\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni keyserver non valide\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opzioni keyserver non valide\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opzione di filtro non valida: %s\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di elenco non valide\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "opzioni di elenco non valide\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "visualizzare gli ID foto durante la verifica della firma"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "mostra URL dei criteri durante la verifica della firma"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "mostra tutte le notazioni durante la verifica della firma"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "mostra notazioni standard IETF durante la verifica della firma"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "mostra le notazioni fornite dall'utente durante la verifica della firma"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostra gli URL preferiti del keyserver durante la verifica della firma"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "mostra validità DELL'ID utente durante la verifica della firma"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostra ID utente revocati e scaduti nella verifica della firma"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr "mostra solo l'ID utente primario nella verifica della firma"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "convalidare le firme con i dati PKA"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "elevare la fiducia delle firme con dati PKA validi"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di verifica non valide\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opzioni di verifica non valide\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, 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:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "elenco di individuazione automatica delle chiavi non valido\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non è permesso usare %s con %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "AVVISO: in esecuzione con l'ora di sistema falso: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritmo di compressione selezionato non valido\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, 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:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "crittografia simmetrica di '%s' non riuscita: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "esportazione come chiave ssh non riuscita: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo hash non valido '%s'\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, 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:5078
+#: g10/gpg.c:5076
 #, 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:5134
+#: g10/gpg.c:5132
 #, 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:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, 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:5492
+#: g10/gpg.c:5490
 #, 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:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL del keyserver preferito specificato non è valido\n"
@@ -3357,7 +3523,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
@@ -4069,7 +4235,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
@@ -4242,8 +4408,8 @@ msgstr "Ho controllato questa chiave con molta attenzione.\n"
 msgid "Really sign? (y/N) "
 msgstr "Davvero firmare? (y/N) "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -4445,7 +4611,7 @@ msgstr ""
 "revocabili\n"
 "  (nrsign), o qualsiasi altra combinazione (ltsign, tnrsign, ecc.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "La chiave è stata revocata."
 
@@ -4493,7 +4659,7 @@ msgstr "Rimuovere davvero questo ID utente? (y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Spostare davvero la chiave primaria? (y/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "È necessario selezionare esattamente una chiave.\n"
 
@@ -4569,162 +4735,162 @@ msgstr "Salvare le modifiche? (y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Uscire senza salvare? (y/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "non può revocare l'ultimo ID utente valido.\n"
 
-#: g10/keyedit.c:2476
+#: g10/keyedit.c:2532
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoca dell'ID utente non riuscita: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "impostazione dell'ID utente primario non riuscita: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" non è un'impronta digitale\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" non è l'impronta digitale primaria\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "ID utente '%s' non valido: %s\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "Nessun ID utente corrispondente."
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "Niente da firmare.\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Non firmato da te.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' non è un'ora di scadenza valida\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" non è un'impronta digitale corretta\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "sottochiave \"%s\" non trovata\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Server delle chiavi preferito: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Notazioni: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "La seguente chiave è stata revocata su %s dalla chiave %s %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Questa chiave può essere revocata dalla chiave %s %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(sensibile)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "creato: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "revocato: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "scaduto: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "scadenza: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "utilizzo: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "scheda-no: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "attendibilità: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "validità: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Questa chiave è stata disabilitata"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4733,17 +4899,17 @@ msgstr ""
 "corretta\n"
 "finchè non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "revocato"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "scaduto"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4753,17 +4919,17 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "AVVISO: la sottochiave di crittografia scade a breve.\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Si consiglia di modificare la data di scadenza troppo.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4772,73 +4938,73 @@ msgstr ""
 "ATTENZIONE: Questa è una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            può causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Tale ID utente esiste già in questa chiave!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Firma %d eliminata.\n"
 msgstr[1] "Firme %d eliminate.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Non è stato cancellato nulla.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "non valido"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utente \"%s\" compattato: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "ID utente \"%s\": firma %d rimossa\n"
 msgstr[1] "ID utente \"%s\": firme %d rimosse\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID utente \"%s\": già ridotto a icona\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID utente \"%s\": già pulito\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4848,218 +5014,218 @@ msgstr ""
 "            designato può causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non è possibile aggiungere un revocatore designato a una chiave in stile\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di sè stessa\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "questa chiave è già stata designata come revocatore\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ATTENZIONE: la nomina di una chiave a revocatrice designata non può essere\n"
 "annullata.\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sei sicuro di voler nominare questa chiave come revocatore designato? (y/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 "Si è sicuri di voler modificare l'ora di scadenza per più sottochiavi? (y/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modifica dell'ora di scadenza per una sottochiave.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 msgid "Changing usage of a subkey.\n"
 msgstr "Modifica dell'utilizzo di una sottochiave.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 msgid "Changing usage of the primary key.\n"
 msgstr "Modifica dell'utilizzo della chiave primaria.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la sottochiave di firma %s è già certificata incrociata\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "la sottochiave %s non firma e pertanto non deve essere certificata\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ignorare l'autode firma v3 sull'ID utente \"%s\"\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Immettere l'URL del server di chiavi preferito: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerlo sostituire? (y/N) "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerlo eliminare? (y/N) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Immettere la notazione: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Procedere? (y/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun ID utente con hash %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nessuna sottochiave con ID di chiave '%s'.\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessuna sottochiave con indice %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utente: \"%s\"\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave è scaduta il %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (non revocabile)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocato dalla chiave %s su %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, 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:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" è già stato revocato\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Impossibile revocare l'ultimo ID utente valido.\n"
 
-#: g10/keyedit.c:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La chiave %s è già stata revocata.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sottochiave %s è già stata revocata.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5520,7 +5686,7 @@ msgstr ""
 "numeri casuali migliori possibilità di raccogliere abbastanza entropia.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
@@ -5591,11 +5757,11 @@ msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "errore durante la scrittura della chiave pubblica '%s': %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5604,7 +5770,7 @@ msgstr ""
 "consiglia di utilizzare\n"
 "il comando \"--edit-key\" per generare una sottochiave a questo scopo.\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5612,7 +5778,7 @@ msgstr ""
 "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5620,23 +5786,23 @@ msgstr ""
 "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keygen.c:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Davvero creare? (y/N) "
 
@@ -5850,84 +6016,84 @@ msgstr "richiesta di chiave da '%s'\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVVISO: impossibile recuperare l'URI %s: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chiave di sessione cifrata con %s\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passphrase generata con algoritmo digest sconosciuto %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica è %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "crittografata con la chiave %u bit %s, ID %s, creata %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr ""
 "crittografata con chiave %s, ID %s\n"
 "\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "AVVISO: più testo in chiaro visti\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrità del messaggio non era protetta\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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"
@@ -5937,179 +6103,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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Utilizzare comunque l'opzione '%s' per decrittografare.\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decrittazione costretto a fallire!\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Nota: mittente richiesto \"solo per i tuoi occhi\"\n"
 
-#: g10/mainproc.c:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "nessuna firma trovata\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma BAD da \"%s\""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \"%s\""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \"%s\""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire questi dati di firma ambigui\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firma effettuata %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               utilizzando la chiave %s %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               autorità emittente \"%s\"\n"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, 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:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                 aka \"%s\""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadrà il %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "Firma %s, algoritmo digest %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ", algoritmo a chiave "
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, 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:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "non è una firma separata\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
@@ -6176,32 +6342,32 @@ msgstr "(errore segnalato: %s <%s>)\n"
 msgid "(further info: "
 msgstr "(ulteriori informazioni: "
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" è una opzione deprecata\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVVISO: \"%s\" è un comando deprecato - non utilizzarlo\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: \"%s\" è obsoleto in questo file - ha effetto solo in %s\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@ -6209,37 +6375,37 @@ msgstr ""
 "AVVISO: \"%s%s\" è un'opzione obsoleta- non ha alcun effetto ad eccezione di "
 "%s\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Non compresso"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "non compresso|nessuno"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "questo messaggio può non essere utilizzabile da %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "opzione ambigua '%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "opzione sconosciuta '%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "La chiave pubblica ECDSA dovrebbe essere in codifica SEC multipla di 8 bit\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "digest debole sconosciuto '%s'\n"
@@ -6272,24 +6438,24 @@ msgstr "scrivo su stdout\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "presupponendo i dati firmati in '%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ATTENZIONE: la chiave di sessione cifrata simmetricamente è potenzialmente\n"
 "non sicura\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Notazione della firma critica sconosciuta: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -6716,12 +6882,12 @@ msgstr "destinatario predefinito sconosciuto \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Nota: la chiave %s non ha funzionalità %s\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Nota: la chiave %s non ha preferenze per %s\n"
@@ -7167,7 +7333,7 @@ msgstr ""
 "si tratta di una chiave Elgamal generata da PGP che non è sicura per le "
 "firme!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@ -7212,7 +7378,7 @@ msgstr "errore durante la ricerca del record di attendibilità in '%s': %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "errore di lettura in '%s': %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
@@ -7732,121 +7898,121 @@ msgstr "AVVISO: crittografia a %s, che non dispone di ID utente non revocati\n"
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' non è un keyID lungo valido\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chiave %s: accettata come chiave attendibile\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chiave %s si verifica più di una volta nel trustdb\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chiave %s: nessuna chiave pubblica per la chiave attendibile - ignorata\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chiave %s contrassegnata come considerata attendibile\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, tipo %d: read fallita: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "il trust record %lu non è del tipo richiesto %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 "È possibile provare a creare nuovamente il trustdb utilizzando i comandi:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Se ciò non funziona, consultare il manuale\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "impossibile utilizzare il modello di trust sconosciuto (%d) - presupponendo "
 "il modello di trust %s\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "utilizzo del modello di trust %s\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "non è necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimo controllo del trustdb sarà fatto il %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "non è necessario un controllo trustdb con il modello di trust '%s'\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "non è necessario un aggiornamento trustdb con il modello di trust '%s'\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chiave pubblica %s non trovata: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "Chiave %d elaborata"
 msgstr[1] "Chiavi %d elaborate"
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, 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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7854,30 +8020,30 @@ msgstr ""
 "profondità: %d  valido: %3d  firmato: %3d  trust: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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"
 
@@ -7889,39 +8055,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]"
 
@@ -7969,33 +8135,33 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, 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-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Tentativi rimanenti: %d"
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Inserisci il PIN di amministratore"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Si prega di inserire il PIN per le chiavi standard."
 
@@ -8065,7 +8231,7 @@ msgstr "impossibile memorizzare l'impronta digitale: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "impossibile memorizzare la data di creazione: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "errore durante il recupero dello stato CHV dalla scheda\n"
@@ -8130,7 +8296,7 @@ msgstr "Il PIN per CHV%d è troppo breve; la lunghezza minima è %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifica CHV%d non riuscita: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "carta è bloccata in modo permanente!\n"
@@ -8278,7 +8444,7 @@ msgstr "scheda non supporta l'algoritmo digest %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "firme create finora: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8286,7 +8452,7 @@ msgstr ""
 "la verifica del PIN di amministrazione è attualmente vietata tramite questo "
 "comando\n"
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossibile accedere a %s - scheda OpenPGP non valida?\n"
@@ -8302,55 +8468,55 @@ msgstr "||Inserisci il tuo PIN sul pinpad del lettore"
 msgid "|N|Initial New PIN"
 msgstr "|N|Nuovo PIN iniziale"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "eseguire in modalità multi server (in primo piano)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL| impostare il livello di debug su LEVEL"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|scrittura di un registro in FILE"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|connessione al lettore alla porta N"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|utilizzare NAME come driver ct-API"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|utilizzare NAME come driver PC/SC"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "non utilizzare il driver CCID interno"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|scollegare la scheda dopo N secondi di inattività"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "non utilizzare il pinpad di un lettore"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "negare l'uso dei comandi della scheda di amministrazione"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "utilizzare l'input a lunghezza variabile per il pinpad"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "negare l'uso dei comandi della scheda di amministrazione"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Utilizzo: @SCDAEMON@ [opzioni] (-h per assistenza)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8358,23 +8524,31 @@ msgstr ""
 "Sintassi: scdaemon [opzioni] [comando [args]]\n"
 "Daemon smartcard per @GNUPG@\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "si prega di utilizzare l'opzione '--daemon' per eseguire il programma in "
 "background\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "gestore per fd %d avviato\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "gestore per fd %d terminato\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr ""
+"errore durante il recupero delle informazioni sull'utilizzo della chiave: "
+"%s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8432,7 +8606,7 @@ msgstr "ricerca dell'emittente in una posizione esterna\n"
 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:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "impossibile ottenere authorityInfoAccess: %s\n"
@@ -8594,7 +8768,7 @@ msgstr "certificato radice non contrassegnato come attendibile"
 msgid "checking the trust list failed: %s\n"
 msgstr "controllo dell'elenco di attendibilità non riuscito: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "catena di certificati troppo lunga\n"
@@ -8648,7 +8822,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash di bit %u non è valido per una chiave %u bit %s\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8659,7 +8833,7 @@ msgstr "fuori dal nucleo\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(questo è l'algoritmo MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "nessuno"
 
@@ -8694,48 +8868,41 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "creato %s, scade %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 "nessun utilizzo chiave specificato - supponendo che tutti gli utilizzi\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr ""
-"errore durante il recupero delle informazioni sull'utilizzo della chiave: "
-"%s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 "certificato non avrebbe dovuto essere utilizzato per la certificazione\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 "certificato non deve essere stato utilizzato per la firma della risposta "
 "OCSP\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certificato non avrebbe dovuto essere utilizzato per la crittografia\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certificato non avrebbe dovuto essere utilizzato per la firma\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificato non è utilizzabile per la crittografia\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificato non è utilizzabile per la firma\n"
@@ -8930,6 +9097,11 @@ msgstr "Creare un certificato autofirmato? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "Vengono utilizzati i seguenti parametri:\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "errore durante la creazione del file temporaneo: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "Creazione di un certificato autofirmato.  "
@@ -9007,123 +9179,123 @@ msgstr "eliminazione del certificato \"%s\" non riuscita: %s\n"
 msgid "no valid recipients given\n"
 msgstr "nessun destinatario valido dato\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "elencare le chiavi esterne"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "catena di certificati valida"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "importa certificati"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "esporta certificati"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "registrare una smart card"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "passare un comando al dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "richiamare gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "creare output codificato in base 64"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "non usa per niente il terminale"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|numero di certificati da includere"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|prendere le informazioni sui criteri da FILE"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "presupporre che l'input sia in formato PEM"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "presupporre che l'input sia in formato base 64"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "presupporre che l'input sia in formato binario"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "creare output codificato in base 64"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|utilizzare USER-ID come chiave segreta predefinita"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|aggiungere il tasto all'elenco dei keyring"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "recupera i certificati degli emittenti mancanti"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "Nome: utilizzare il nome di codifica per le passphrase PKCS-12"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "non consultare mai una CRL"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "non controllare i certificati radice nei CRL"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "verificare la validità utilizzando OCSP"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|numero di certificati da includere"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|FILE|prendere le informazioni sui criteri da FILE"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "non controllare le politiche dei certificati"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "recupera i certificati degli emittenti mancanti"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "non usa per niente il terminale"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|FILE|scrittura di un registro in modalità server in FILE"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|usa l'algoritmo di cifratura NAME"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FILE|scrittura di un registro di controllo in FILE"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|usa l'algoritmo di message digest NAME"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "risponde \"sì\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "risponde \"no\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FILE|aggiungere il tasto all'elenco dei keyring"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|USER-ID|utilizzare USER-ID come chiave segreta predefinita"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|utilizzare questo keyserver per cercare le chiavi"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|usa l'algoritmo di cifratura NAME"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAME|usa l'algoritmo di message digest NAME"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|scrittura di un registro di controllo in FILE"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Utilizzo: @GPGSM@ [opzioni] [file] (-h per assistenza)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9134,27 +9306,27 @@ msgstr ""
 "protocollo S/MIME\n"
 "Il funzionamento predefinito dipende dai dati di input\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modello di convalida sconosciuto '%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importazione di certificati comuni '%s'\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossibile firmare utilizzando '%s': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "comando non valido (non esiste alcun comando implicito)\n"
@@ -9214,7 +9386,7 @@ msgstr "problema durante la ri-ricerca del certificato: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "errore durante l'archiviazione dei flag: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Errore - "
 
@@ -9250,7 +9422,7 @@ msgstr ""
 "\n"
 "%s%sSono davvero sicuri di voler eseguire questa operazione?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9301,7 +9473,7 @@ msgstr "[data non specificata]"
 msgid "algorithm:"
 msgstr "algoritmo:"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9309,17 +9481,17 @@ msgstr ""
 "firma non valida: l'attributo digest del messaggio non corrisponde a uno "
 "calcolato\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Buona firma da"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "                 aka"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Questa è una firma qualificata\n"
@@ -10124,114 +10296,137 @@ msgstr "previsto nome file assoluto\n"
 msgid "looking up '%s'\n"
 msgstr "ricerca di '%s'\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "elencare il contenuto della cache CRL"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|carica CRL da FILE nella cache"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|recupero di un CRL dall'URL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "arrestare il dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "svuotare la cache"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|FILE|scrittura dei registri in modalità server in FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr "consentire il controllo della versione del software online"
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "eseguire senza chiedere a un utente"
+#: dirmngr/dirmngr.c:218
+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:196
-msgid "force loading of outdated CRLs"
-msgstr "forzare il caricamento di CRL obsoleti"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "consentire l'invio di richieste OCSP"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
+msgstr "instradare tutto il traffico di rete tramite Tor"
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
-msgstr "consentire il controllo della versione del software online"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "Configurazione per Keyservers"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "| URL: utilizzare keyserver all'URL"
+
+#: dirmngr/dirmngr.c:244
+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:200
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr "Configurazione per i server HTTP"
+
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "inibire l'uso di HTTP"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "inibire l'uso di LDAP"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorare i punti di distribuzione CRL HTTP"
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
-msgstr "ignorare i punti di distribuzione CRL LDAP"
-
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "ignorare gli URL del servizio OCSP contenuti nel certificato"
-
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|reindirizza tutte le richieste HTTP all'URL"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "utilizzare l'impostazione proxy HTTP del sistema"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "Configurazione dei server LDAP da utilizzare"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "inibire l'uso di LDAP"
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignorare i punti di distribuzione CRL LDAP"
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|utilizzare HOST per le query LDAP"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "non utilizzare host di fallback con --ldap-proxy"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|utilizzare questo keyserver per cercare le chiavi"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|lettura dell'elenco dei server LDAP da FILE"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 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:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|imposta il timeout LDAP su N secondi"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "Configurazione per OCSP"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "consentire l'invio di richieste OCSP"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignorare gli URL del servizio OCSP contenuti nel certificato"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|utilizzare risponditore OCSP all'URL"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|Risposta OCSP firmata da FPR"
 
-#: dirmngr/dirmngr.c:235
-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:240
-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
-msgid "route all network traffic via Tor"
-msgstr "instradare tutto il traffico di rete tramite Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "forzare il caricamento di CRL obsoleti"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10241,11 +10436,11 @@ msgstr ""
 "(Vedere il manuale \"info\" per un elenco completo di tutti i comandi e le "
 "opzioni)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Utilizzo: @DIRMNGR@ [opzioni] (-h per assistenza)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10253,84 +10448,84 @@ msgstr ""
 "Sintassi: @DIRMNGR@ [opzioni] [comando [args]]\n"
 "Accesso keyserver, CRL e OCSP per @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "i livelli di debug validi sono: %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "utilizzo: %s [opzioni] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "recupero CRL da '%s' non riuscito: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "elaborazione CRL da '%s' non riuscita: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: riga troppo lunga - ignorata\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: rilevata impronta digitale non valida\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s: %u: errore di lettura: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, 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:1955
+#: dirmngr/dirmngr.c:1949
 #, 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:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 ricevuto - nessuna azione definita\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM ricevuto - arresto …\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM ricevuto - connessioni ancora %d attive\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "arresto forzato\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT ricevuto - arresto immediato\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "segnale %d ricevuto - nessuna azione definita\n"
@@ -10520,95 +10715,95 @@ msgstr "hash della risposta OCSP per '%s' non riuscito: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "non firmato da un certificato del firmatario OCSP predefinito"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 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:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, 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:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "nessun risponditore OCSP predefinito definito\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "nessun firmatario OCSP predefinito definito\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "utilizzando il risponditore OCSP predefinito '%s'\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "utilizzo del risponditore OCSP '%s'\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, 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:792
 #, 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:793
 msgid "good"
 msgstr "buono"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, 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:846
 #, 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:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "Il risponditore OCSP ha restituito uno stato troppo vecchio\n"
@@ -10618,67 +10813,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:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "serialno mancante nell'ID certificato"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire non riuscito: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url non riuscito: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "errore durante l'invio dei dati: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch non riuscito: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert non riuscito: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d superato\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossibile allocare la struttura di controllo: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "impossibile allocare il contesto assuan: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "impossibile inizializzare il server: %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Problema di accettazione assuan: %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Elaborazione Assuan non riuscita: %s\n"
@@ -10721,7 +10916,7 @@ msgstr "catena di certificati è buono\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certificato non deve essere stato utilizzato per la firma CRL\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "tranquilla"
 
@@ -10814,277 +11009,132 @@ msgstr "riga di invio non riuscita: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "errore durante l'invio delle opzioni standard: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Opzioni che controllano l'output diagnostico"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Opzioni che controllano la configurazione"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Opzioni utili per il debug"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Opzioni che controllano la sicurezza"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|Chiavi SSH di N-scadenza dopo N secondi"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|imposta la durata massima della cache del PIN su N secondi"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|set durata massima del tasto SSH su N secondi"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Opzioni che applicano un criterio di passphrase"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "non consentire l'esclusione dei criteri di passphrase"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|Lunghezza minima richiesta per le nuove passphrase su N"
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr "|N|Per una nuova passphrase è necessario almeno N caratteri non alfa"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|FILE||controlla le nuove passphrase rispetto al modello in FILE"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "| La passphrase dopo N giorni"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "non consentono il riutilizzo di vecchie passphrase"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|Il timeout di Pinentry è impostato su N secondi"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|usa NAME come chiave segreta predefinita"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "Anche nome-crittografare all'ID utente NOME"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|configurare gli alias di posta elettronica"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "Configurazione per Keyservers"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "| URL: utilizzare keyserver all'URL"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "consentire ricerche PKA (richieste DNS)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-"|MECHANISMS|utilizzare MECHANISMS per individuare le chiavi in base "
-"all'indirizzo di posta elettronica"
-
-#: tools/gpgconf-comp.c:764
-msgid "import missing key from a signature"
-msgstr "importare la chiave mancante da una firma"
-
-#: tools/gpgconf-comp.c:767
-msgid "include the public key in signatures"
-msgstr "includere la chiave pubblica nelle firme"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "disabilitare tutti gli accessi al dirmngr"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "Nome: utilizzare il nome di codifica per le passphrase PKCS-12"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "non controllare i certificati radice nei CRL"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Opzioni che controllano il formato dell'output"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Opzioni che controllano l'interattività e l'applicazione"
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr "Opzioni che controllano l'uso di Tor"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "Configurazione per i server HTTP"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "utilizzare l'impostazione proxy HTTP del sistema"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "Configurazione dei server LDAP da utilizzare"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "Elenco server LDAP"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "Configurazione per OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr "Chiavi private"
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr "Smartcard"
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr "Rete"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr "Voce passphrase"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "Componente non adatto per il lancio"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, 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:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Verifica esterna del componente %s non riuscita"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Si noti che le specifiche del gruppo vengono ignorate\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "errore durante la chiusura di '%s'\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "errore durante l'analisi di '%s'\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "elencare tutti i componenti"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "controllare tutti i programmi"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|opzioni di elenco"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|modifica delle opzioni"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|Opzioni di controllo"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "applicare valori predefiniti globali"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|aggiornare i file di configurazione utilizzando FILE"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "ottenere le directory di configurazione per @GPGCONF @"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "file di configurazione globale dell'elenco"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "controllare il file di configurazione globale"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr "interrogare il database delle versioni software"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "ricaricare tutto o un determinato componente"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "lanciare un determinato componente"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "uccidere un determinato componente"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "attivare le modifiche in fase di esecuzione, se possibile"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Utilizzo: @GPGCONF@ [opzioni] (-h per assistenza)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11092,15 +11142,15 @@ msgstr ""
 "Sintassi: @GPGCONF@ [opzioni]\n"
 "Gestire le opzioni di configurazione per gli strumenti del @GNUPG@ sistema\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "È necessario un argomento componente"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Componente non trovato"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "Nessun argomento consentito"
 
@@ -11117,6 +11167,36 @@ msgstr ""
 "Sintassi: gpg-check-pattern [opzioni] patternfile\n"
 "Controllare una passphrase data su stdin rispetto al patternfile\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "errore durante la scrittura nel file temporaneo: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "utilizzare un file di registro per il server"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|FILE|scrittura di un registro in modalità server in FILE"
+
+#~ msgid "run without asking a user"
+#~ msgstr "eseguire senza chiedere a un utente"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "consentire ricerche PKA (richieste DNS)"
+
+#~ msgid "import missing key from a signature"
+#~ msgstr "importare la chiave mancante da una firma"
+
+#~ msgid "include the public key in signatures"
+#~ msgstr "includere la chiave pubblica nelle firme"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "Opzioni che controllano il formato dell'output"
+
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Opzioni che controllano l'uso di Tor"
+
+#~ msgid "LDAP server list"
+#~ msgstr "Elenco server LDAP"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "richiesta della chiave %s dal server %s %s\n"
 
@@ -11288,9 +11368,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "impossibile aprire %s per la scrittura: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "errore durante la scrittura in %s: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "errore durante la lettura da %s: %s\n"
 
diff --git a/po/ja.gmo b/po/ja.gmo
index 7a0e070..b0411e3 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index c0d9380..cb8a3fa 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,9 +9,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 2.2.30\n"
+"Project-Id-Version: gnupg 2.2.33\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+0200\n"
 "PO-Revision-Date: 2021-08-27 08:56+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: none\n"
@@ -137,8 +137,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "パスフレーズ:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "一致���ん - も�一度"
 
@@ -183,62 +183,92 @@ msgstr "�正�PIN��"
 msgid "Bad Passphrase"
 msgstr "パスフレーズ��正��"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr "注�: ウェブ・ブラウザ�ら�リクエスト��。"
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr "注�: リモート・サイト�ら�リクエスト��。"
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "カード・シリアル番���得エラー: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "��パスフレーズをも�一度入力������"
+
+#: agent/command.c:2423
+#, c-format
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"%s システム�イン�ート�れ�オブジェクトを�護�る���パスフレーズを入力�"
+"�����"
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+"���(���副�)�パスフレーズ��護�れ���ん。エクス�ート�る���新"
+"��パスフレーズを入力������。"
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh��%dビットより大��も��サ�ート�れ��ん\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "'%s'�作�����ん: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "'%s'�開���ん: %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "カード・シリアル番���得エラー: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "カードを検出����。シリアル番�: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "カード�ssh��証���り��ん: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "�当�カード���見��り��ん: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "カード�リスト ��得エラー: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -247,24 +277,20 @@ msgstr ""
 "sshプロセス�以下���使用を�求����:%%0A  %s%%0A  (%s)%%0A��使用を�"
 "����?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "許��る"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "拒��る"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "以下�ssh��対�るパスフレーズを入力������:%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "��パスフレーズをも�一度入力������"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -273,96 +299,92 @@ msgstr ""
 "パスフレーズを入力������。gpg-agent����管��信��秘密�%%0A   %s"
 "%%0A   %s%%0Aを�護���。"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "ソケット�らストリームを作��る��失敗����: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "以下�シリアル番��カードを挿入������"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "今�カードを抜��以下�シリアル番��カードを挿入������"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "管�者PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "リセット・コード"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr "カード/トークン�ACKボタンを押������。"
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr "リーダー�ピンパッドを入力�使������。"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "��リセット・コードをも�一度入力������"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "��PUKをも�一度入力������"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "��PINをも�一度入力������"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "リセット・コード�正��繰り返�れ����ん。も�一度"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK�正��繰り返�れ����ん。も�一度"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN�正��繰り返�れ����ん。も�一度"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "カード�ロックを解除�る���PIN%s%s%sを入力������"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "一時ファイル�作�エラー: %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "一時ファイル�書�込�エラー: %s\n"
+#: agent/genkey.c:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "'%s'�書�込�エラー: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "新��パスフレーズを入力������"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "�れ�も�れを使���"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "パスフレーズ�入力�れ��ん���!%0A空�パスフレーズ���られ��ん。"
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -371,176 +393,243 @@ msgstr ""
 "パスフレーズ�入力�れ��ん��� - 通常�れ�良���考���!%0A��何��"
 "護も必�������を確�����。"
 
-#: agent/genkey.c:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "����護�必��り��ん"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, 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:296
+#: agent/genkey.c:282
 #, 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:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "パスフレーズ���よ�知られ��る用語や特定�パターン�マッ��るも��%%0A"
 "����ょ�。"
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告: 安全��言���パスフレーズ�入力�れ���。"
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "新���を�護�る����%0Aパスフレーズを入力������。"
 
-#: agent/genkey.c:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "新��パスフレーズを入力������"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@オプション:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
+msgstr "起動����使�れるオプション"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "デーモン・モード�実行 (�ックグラウンド)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "サー�・モード�実行 (フォアグラウンド)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr "スーパー�イズド・モード�実行"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "冗長"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "��ら������"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "コンソール�らデタッ����"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "sh-形��コマンド出力"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "csh-形��コマンド出力"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|FILE�らオプションを読�込���"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "コンソール�らデタッ����"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "診断出力を制御�るオプション"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "サー��ログ・ファイルを使�"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "冗長"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|PGMをPIN入力プログラム���使�"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "��ら������"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|PGMをSCdaemonプログラム���使�"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|FILE�サー�・モード�ログを書�出�"
+
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "コンフィグレーションを制御�るオプション"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "SCdaemonを使���"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|PGMをSCdaemonプログラム���使�"
+
+#: agent/gpg-agent.c:213
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|NAME�ら�コマンドを��付�る"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "TTY�変更�求を無視�る"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "Xディスプレイ�変更�求を無視�る"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "sshサ�ートを有功��る"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|ALGO|ssh署��表示�ALGOを使�"
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "puttyサ�ートを有功��る"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "セキュリティを制御�るオプション"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|N秒後�����PINを無効��る"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|N秒後�SSH�を無効��る"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|最大PINキャッシュ存続時間をN秒��る"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|最大SSH�存続時間をN秒��る"
+
+#: agent/gpg-agent.c:248
 msgid "do not use the PIN cache when signing"
 msgstr "署��対��PIN���を使���"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:250
 msgid "disallow the use of an external password cache"
 msgstr "外部�パスワードキャッシュ�使用を����"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "クライアント���\"trusted\"マークを��る��を����"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 msgid "allow presetting passphrase"
 msgstr "パスフレーズ�事�設定を��る"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "パスワード・�リシー�強制オプション"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "パスワード・�リシーを迂回�る��を����"
+
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|新��パスフレーズ�必���る最低長をN��る"
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+"|N|新��パスフレーズ���アルファベット���キャラクタを最低N必���る"
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|新��パスフレーズをFILE�パターン�対���ェック�る"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|N日後�パスフレーズを期�切れ��る"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "��パスフレーズを�使用�る��を����"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
+msgstr "PIN-Entryを制御�るオプション"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
+msgstr "PIN-entry を決��使���"
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr "pinentryより優先��パスフレーズ入力を����"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
-msgstr "Emacsを通��パスフレーズを催促�る��を��る"
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr "PIN-Entry�キーボード�マウスを�有��る"
 
-#: agent/gpg-agent.c:258
-msgid "enable ssh support"
-msgstr "sshサ�ートを有功��る"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|PGMをPIN入力プログラム���使�"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "|ALGO|ssh署��表示�ALGOを使�"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|Pinentry�タイムアウトをN秒��る"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "puttyサ�ートを有功��る"
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "�グ� <@EMAIL@> ���報告����。\n"
 
-#: agent/gpg-agent.c:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "使�方: @GPG_AGENT@ [オプション] (ヘルプ� -h)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -548,135 +637,143 @@ msgstr ""
 "形�: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
 "@GnuPG@�秘密��管�\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "無効�debug-level '%s'�与�られ���\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "�択�れ�ダイジェスト・アルゴリズム��無効��\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "'%s' �らオプションを読�込���\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "注�: '%s'�オプション��考�られ��ん\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "ソケット�作�����ん: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "ソケット�'%s'�長����\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
-msgstr ""
+msgstr "動作���る %s �らソケットを奪��り��\n"
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent�既�実行�れ���� - 新��も�をスタート����ん\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "ソケット�ナンス�得エラー\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "'%s'�ソケット��インド�エラー: %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "'%s'�許��設定����ん: %s\n"
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "ソケット'%s'�listen\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "ディレクトリ'%s'�作�����ん: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "ディレクトリ'%s'�作��れ���\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s'�stat()�失敗����: %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "'%s'をホーム・ディレクトリ�使���ん\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d�ナンス�読�込�エラー: %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "�ンドラ0x%lx (fd %d �対�る)�開始\n"
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "�ンドラ0x%lx (fd %d �対�る)�終了\n"
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh �ンドラ0x%lx (fd %d �対�る)�開始\n"
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh �ンドラ0x%lx (fd %d �対�る)�終了\n"
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect�失敗����: %s - 一秒待���\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s �止����\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "��セッション�gpg-agent�実行�れ����ん\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@オプション:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "使�方: gpg-preset-passphrase [オプション] KEYGRIP (ヘルプ� -h)\n"
@@ -689,8 +786,8 @@ msgstr ""
 "形�: gpg-preset-passphrase [オプション] KEYGRIP\n"
 "パスワードキャッシュ�管�\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -698,9 +795,8 @@ msgstr ""
 "@コマンド:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -757,43 +853,43 @@ msgstr "キャンセル�れ���\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "パスフレーズを������る際�エラー: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "'%s'を開�際�エラー: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "ファイル'%s'(行 %d): %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "ステートメント \"%s\" �'%s'�無視�れ���(行 %d)\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "システム信用リスト'%s'�得られ��ん\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "'%s'��正�フィンガープリント (行 %d)\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "'%s'�無効��フラグ(行 %d)\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "'%s'�読�込�エラー(行 %d): %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "信用�れ�ルート証明書�リスト�読�込�エラ−\n"
@@ -806,18 +902,18 @@ msgstr "信用�れ�ルート証明書�リスト�読�込�エラ−\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "究極的��れを信用�%%0A  \"%s\"%%0A正�ユーザ�証明書��証����?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "��"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "���"
@@ -830,7 +926,7 @@ msgstr "���"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -842,20 +938,20 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "正��"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "誤り"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "注�: パスフレーズ�変更�れ����ん。%0A今�変更������。"
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -864,26 +960,26 @@ msgstr ""
 "��パスフレーズ�%.4s-%.2s-%.2s�ら変更�れ����ん。%%0A今�変更����"
 "��。"
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "パスフレーズを変更�る"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "後�変更�る"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "本当����: keygrip%%0A  %s%%0A  %%C%%0Aを削除����?"
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "�を削除�る"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -916,7 +1012,7 @@ msgstr "作��れ�署��検査�失敗����: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "秘密部分�得られ��ん\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "公開�アルゴリズム%d (%s)�サ�ート�れ����ん\n"
@@ -931,52 +1027,52 @@ msgstr "�護アルゴリズム%d (%s)�サ�ート�れ����ん\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "�護�ッシュ・アルゴリズム%d (%s)�サ�ート�れ����ん\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "パイプ�作�エラー: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "パイプ�ストリーム作�エラー: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "プロセスforkエラー: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "プロセス%d�終了待��失敗: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "'%s'�実行エラー: ��ら�インストール�れ����ん\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "'%s'�実行エラー: exitステイタス %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "'%s'�実行エラー: 終了����\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "プロセス�終了待��失敗: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "プロセス %d �exitコード�得エラー: %s\n"
@@ -1006,12 +1102,12 @@ msgstr "警告: '%s'�安全���所有 \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: '%s'�安全���許� \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ファイル'%s'�アクセス��る�を待���...\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "'%s'�ら'%s'���変更�失敗: %s\n"
@@ -1071,24 +1167,24 @@ msgstr "%lu�イト�確�����セキュア・メモリ�足り��
 msgid "out of core while allocating %lu bytes"
 msgstr "%lu�イト�確�����メモリ�足り��ん"
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "�分�メモリ�確��エラー: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 "%s:%u: \"%s\"��使�れ�����オプション�� - �ん�効果も�り��ん\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 "*警告*: \"%s%s\"��使�れ�����オプション�� - �ん�効果も�り��ん\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "�明�debugフラグ'%s'�無視�れ���\n"
@@ -1388,7 +1484,7 @@ msgstr "無効�オプション"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "オプション\"%.50s\"�引数��り��ん\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "オプション\"%.50s\"��無効�引数��\n"
@@ -1418,17 +1514,17 @@ msgstr "コマンド\"%.50s\"�������\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "無効�オプション \"%.50s\"\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "注�: デフォルト�オプション・ファイル '%s' ��り��ん\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "オプション・ファイル '%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr "注�: オプション \"--%s\" をグロー�ルコンフィグ����無視����\n"
@@ -1448,41 +1544,41 @@ msgstr "iconv_open�失敗����: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "'%s'�ら'%s'��変��失敗: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "一時ファイル'%s'�作�����ん: %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "'%s'�書�込�エラー: %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "�� lockfile (%d �より作�)を除去���\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "lockを待��� (%d%s �より��) %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(デッドロック?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lock '%s' �作��れ��ん���: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "lock %s を待���...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s ������ (%s �必���在 %s)\n"
@@ -1707,22 +1803,22 @@ msgstr "サーãƒ�ã�‹ã‚‰ã�®å�—ã�‘容れるã�“ã�¨ã�®ã�§ã��ã�ªã�„HTTPりダイレã‚
 msgid "server uses an invalid certificate"
 msgstr "サー��無効�証明書を使�����"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, c-format
 msgid "Note: %s\n"
 msgstr "注�: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGPカード�利用����ん: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGPカードno. %sを検出\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1738,8 +1834,8 @@ msgstr "ã�“ã�®ã‚³ãƒžãƒ³ãƒ‰ã�Œä½¿ã�ˆã‚‹ã�®ã�¯ãƒ�ージョン2ã�®ã‚«ãƒ¼ãƒ‰ã� ã�‘ã�
 msgid "Reset Code not or not anymore available\n"
 msgstr "リセット・コード�(も�や)利用�能���り��ん\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1749,120 +1845,120 @@ msgstr "�����択�? "
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "強制��"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "強制"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "エラー： 普通�ASCII���今�許��れ����。\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "エラー: \"<\"文字�使���ん。\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "エラー: 二��空白��止��。\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "カード所有者�姓 (surname): "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "カード所有者�� (given name): "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "エラー: �������長���� (上�%d文字)。\n"
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "公開�を�得�るURL: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "'%s'�読�込�エラー: %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "'%s'�書�込�エラー: %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "ログイン・データ (アカウント�): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "プライベート DO データ: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "言語�優先指定: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "エラー: 優先指定�文字列�長��無効��。\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "エラー: 優先指定�文字列�無効�文字��り��。\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "敬称 (M = Mr., F = Ms., �る��空白): "
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "エラー: 無効�応答。\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "CA�フィンガープリント: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "エラー: 無効�形��フィンガープリント。\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "���作����ん: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "OpenPGPカード��り��ん"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�行�情報��得エラー: %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "既存��を置�������? (y/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1872,98 +1968,98 @@ msgstr ""
 "      �生���功���場������カード�関�る技術文書を確���\n"
 "      利用��る�長����確�����。\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�長�? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%uビット�切り上���\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s �長� %u-%u �範囲���れ��り��ん\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr "��ら�カード��属性を変更���: "
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 msgid "Signature key\n"
 msgstr "署��\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 msgid "Encryption key\n"
 msgstr "暗�化�\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr "�証�\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "�希望���種類を�択������:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "無効��択��。\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "�%d�属性を変更�る際�エラー: %s\n"
 
-#: g10/card-util.c:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "カード情報��得エラー: %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "��カード�����コマンド�サ�ート�れ����ん。\n"
 
-#: g10/card-util.c:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "暗�化��カード外�ックアップを作�����? (Y/n) "
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "注�: 秘密��も�カード��管���り��!\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "既存��を置������? (y/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1974,165 +2070,165 @@ msgstr ""
 "   PIN = '%s'     管�者PIN = '%s'\n"
 "次�コマンドを使��変更����� --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 msgid "Please select the type of key to generate:\n"
 msgstr "生��る��型を�択������:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) 署��\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 暗�化�\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) �証�\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "�を�管�る場所を�択������:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD�失敗����: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "注�: ��コマンド�カード��管���る�����を破壊���!\n"
 
-#: g10/card-util.c:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr "続����? (y/N) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "工場出�リセットを行����? (本当�ら \"yes\" �入力) "
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "KDF設定�エラー: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "��メニューを終了"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "管�コマンドを表示"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "��ヘルプを表示"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "全有効データを表示"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "カード所有者����変更"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "�を�得�るURL�変更"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "カードURL�指定�れ����得"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "ログイン��変更"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "言語�優先指定�変更"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr "カード所有者�敬称�変更"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "CAフィンガープリント�変更"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "署�強制PINフラグを�転"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "新���を生�"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "PINブロック�解除や変更�メニュー"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "PINを確������データを表示�る"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "PINをリセット・コード�ブロックを解除�る"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr "������データを破壊���"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr "PIN�証�KDFを設定�る"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 msgid "change the key attribute"
 msgstr "��属性�変更"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "管�者専用コマンド\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "管�者コマンド�許��れ����\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "管�者コマンド��止�れ����\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無効�コマンド (\"help\"を�照)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "��コマンド�--output�機能���ん\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "'%s'�開���ん\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�\"%s\"�見��り��ん: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2191,8 +2287,8 @@ msgid "subkey"
 msgstr "副�: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新�失敗����: %s\n"
@@ -2232,24 +2328,24 @@ msgstr "S2Kモード����共通�ESKパケットを使���ん\n"
 msgid "using cipher %s\n"
 msgstr "暗�方� %s を使���\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s'�も�圧縮済���\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "*警告*: '%s'�空�ファイル��\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "暗�アルゴリズム'%s'を%sモード�使��������ん\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "ダイジェスト・アルゴリズム'%s'を%sモード�使��������ん\n"
@@ -2271,7 +2367,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "*警告*: �%s��%sモード���暗�化�����ん\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2279,38 +2381,38 @@ msgid ""
 msgstr ""
 "*警告*: 圧縮アルゴリズム %s (%d) �強制����人�優先指定を�む���\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "共通�暗�方� %s (%d) �強制����人�優先指定を�む���\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s暗�化 �信者:\"%s\"\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "オプション'%s'を%sモード�使��������ん\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s暗�化済�データ\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�明�アルゴリズム%d�よる暗�化\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "*警告*: メッセージ�共通�暗�方��弱���暗�化�れ����。\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "暗�化パケット��扱��障害\n"
@@ -2492,212 +2594,260 @@ msgstr "--allow-non-selfsigned-uid�有効��れ�無効��%s��\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "副�%s(主�%s����)を用���\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "オプション'%s'�有効�値:\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "署�を作�"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "クリア・テクスト署�を作�"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "分�署�を作�"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "データを暗�化"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "暗�化��共通�暗�方���を使用"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "データを復� (デフォルト)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "署�を検証"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "��一覧"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "��署��一覧"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "�署��検査�一覧"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "��フィンガープリント�一覧"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "秘密��一覧"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "新���ペアを生�"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "��や�新���ペアを生�"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr "��や�新��ユーザIDを追加"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr "��や�ユーザIDを失効"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr "��や�新��有効期�を設定"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "全機能��ペアを生�"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "失効証明書を生�"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "公開�リング�ら�を削除"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "秘密�リング�ら�を削除"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "��や���署�"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "��や���ローカル�署�"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "quickly revoke a key signature"
 msgstr "��や����署�を失効"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "��署�"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "��ローカル�署�"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "���署�や編集"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "パスフレーズ�変更"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "�をエクス�ート�る"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "�サー���をエクス�ート�る"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "�サー��ら�をイン�ート�る"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "�サー���を検索�る"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "�サー��ら�を全部更新�る"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "��イン�ート/マージ"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "カード・ステイタスを表示"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "カード�データを変更"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "カード�PINを変更"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "信用データベースを更新"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "メッセージ・ダイジェストを表示"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "サー�・モード�実行"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|TOFU�リシーを��設定�る"
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|デフォルト�秘密����NAMEを用�る"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|ユーザID NAME�も暗�化�る"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|電�メールエイリアスを設定�る"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "厳密�OpenPGP�振舞を採用"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "無変更"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "上書���確�"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr "入力を制御�るオプション"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr "出力を制御�るオプション"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "ASCII形��外装を作�"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|USER-ID|USER-ID用�暗�化"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|出力をFILE�書�出�"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|USER-ID|署�や復����USER-IDを使用"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "正準テキスト・モードを使用"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|圧縮レベルをN�設定 (0��圧縮)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "正準テキスト・モードを使用"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr "��イン�ート�エクス�ートを制御�るオプション"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|FILE|出力をFILE�書�出�"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|メールアドレス�よ���を特定�る際�MECHANISMSを使用�る"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "無変更"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "dirmngr������アクセスを無効��る"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "上書���確�"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr "��リスティングを制御�るオプション"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "厳密�OpenPGP�振舞を採用"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+msgid "Options to specify keys"
+msgstr "�を指定�るオプション"
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|USER-ID用�暗�化"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|署�や復����USER-IDを使用"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr "無人(unattended)使用����オプション"
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr "�����オプション"
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2705,7 +2855,7 @@ msgstr ""
 "@\n"
 "(コマンド�オプション全部�一覧��マニュアル・ページを�覧����)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2725,11 +2875,11 @@ msgstr ""
 " --list-keys [��]         �を表示\n"
 " --fingerprint [��]       フィンガープリントを表示\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "使�方: @GPG@ [オプション] [ファイル] (ヘルプ� -h)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2739,7 +2889,7 @@ msgstr ""
 "署��検査�暗�化���復�\n"
 "デフォルト��作��入力データ��存\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2747,541 +2897,541 @@ msgstr ""
 "\n"
 "サ�ート���るアルゴリズム:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "公開�: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "暗�方�: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "�ッシュ: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "圧縮: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "使�方: %s [オプション] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "対立�るコマンド\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "=記���グループ定義'%s'内�見��り��ん\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���所有\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル'%s'�安全���所有\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���所有\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���許�\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル'%s'�安全���許�\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���許�\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���上�ディレクトリ所有\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "*警告*: コンフィグレーション・ファイル'%s'�安全���上�ディレクトリ所有\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���上�ディレクトリ所有\n"
 
-#: g10/gpg.c:1660
+#: g10/gpg.c:1686
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���上�ディレクトリ許�\n"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 "*警告*: コンフィグレーション・ファイル'%s'�安全���上�ディレクトリ許�\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���上�ディレクトリ許�\n"
 
-#: g10/gpg.c:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "�明�コンフィグレーション項目'%s'\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "��一覧時�フォトIDを表示�る"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "��一覧時���使�方�情報を表示�る"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "署��一覧時��リシーURLを表示�る"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "署��一覧時�����注釈を表示�る"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "署��一覧時�IETF標準注釈を表示�る"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "署��一覧時�ユーザ�注釈を表示�る"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "署��一覧時�優先�サー�URLを表示�る"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "��一覧時�ユーザID�有効性を表示�る"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr "��一覧�失効��ユーザID�期�切れ����ユーザIDを表示�る"
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "��一覧�失効��副��期�切れ����副�を表示�る"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "��一覧��リング���を表示�る"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "署��一覧時�有効期��日付を表示�る"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "�明�TOFU�リシー'%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(�択肢�一覧��\"help\"を使������)\n"
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%sモード���コマンド��止��。\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注�: 普通%s�使���ん!\n"
 
-#: g10/gpg.c:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s'��有効�署�表����り��ん\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\"�正��メール・アドレス���り��ん\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "無効� pinentry mode '%s'��\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "無効��信元�求 '%s' ��\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s'��有効�文字集����り��ん\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "�サー��URLを解��能\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無効��サー�・オプション��\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "無効��サー�・オプション��\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無効�イン�ート・オプション��\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "無効�イン�ート・オプション��\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "無効�フィルタ・オプション��: %s\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無効�エクス�ート・オプション��\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "無効�エクス�ート・オプション��\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無効�一覧オプション��\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "無効�一覧オプション��\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "署��検証時�フォトIDを表示�る"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "署��検証時��リシーURLを表示�る"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "署��検証時�����注釈を表示�る"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "署��検証時�IETF標準注釈を表示�る"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "署��検証時�ユーザ�注釈を表示�る"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "署��検証時�優先�サー�URLを表示�る"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "署��検証時�ユーザID�有効性を表示�る"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "署��検証時�失効��ユーザID�期�切れ����ユーザIDを表示�る"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr "署��検証時�プライマリ・ユーザID��をを表示�る"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "PKAデータ�署�を検証�る"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "有効�PKAデータ�署��信用度を上昇��る"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無効�検証オプション��\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "無効�検証オプション��\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-pathを%s�設定�能\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無効� auto-key-locate リスト��\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "無効� auto-key-locate リスト��\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "*警告*: プログラム�coreファイルを作��る����り��!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "*警告*: %s�%sより優先\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s�%s��も�使��������ん!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s�%s��も�使��も無�味��!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "*警告*: ニセモノ�システム時刻�実行�����: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s ����セキュア���メモリ�実行���ん\n"
 
-#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "�択�れ�暗�アルゴリズム��無効��\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "�択�れ�圧縮アルゴリズム��無効��\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "�択�れ�証明書ダイジェスト・アルゴリズム��無効��\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�正�値�必���\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed�1より大��値�必���\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無効�min-cert-level。0�1�2�3���れ��り��ん\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注�: �純�S2Kモード(0)�使用��強��対���\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無効�S2Kモード。0�1�3���れ��り��ん\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "無効�デフォルト�優先指定\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "無効�個人用暗�方��優先指定\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "無効�個人用ダイジェスト�優先指定\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "無効�個人用圧縮�優先指定\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s�%s����機能���ん\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "圧縮アルゴリズム'%s'を%sモード�使��������ん\n"
 
-#: g10/gpg.c:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信用データベース��期化�失敗����: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "*警告*: 公開�暗�を使������人 (-r) を指定�����\n"
 
-#: g10/gpg.c:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s'�共通�暗��失敗����: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encryptを--s2k-mode 0�使��������ん\n"
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "--symmetric --encryptを%sモード�使��������ん\n"
 
-#: g10/gpg.c:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "--symmetric --sign --encryptを%sモード�使��������ん\n"
 
-#: g10/gpg.c:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�サー����信�失敗����: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�サー��ら��信�失敗����: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "��エクス�ート�失敗����: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "ssh�����エクス�ート�失敗����: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�サー��検索�失敗����: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�サー��更新�失敗����: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "外装除去�失敗����: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "外装�失敗����: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無効��ッシュ・アルゴリズム'%s'��\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "�指定'%s'�構文解�エラー: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, 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:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 "*警告*: コマンド�指定�れ����ん。��を�味���る��当����"
 "� ...\n"
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "開始���。メッセージを打������ ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "���られ�証明書�リシーURL�無効��\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "���られ�署��リシーURL�無効��\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "指定�れ�優先�サー�URL�無効��\n"
@@ -3294,7 +3444,7 @@ msgstr "|FILE|�リングFILE��を扱���"
 msgid "make timestamp conflicts only a warning"
 msgstr "日時�矛盾を警告������"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|��FD�ステイタス情報を書�出�"
 
@@ -3984,7 +4134,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�れ�も����署�������? (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  署��能。\n"
 
@@ -4156,8 +4306,8 @@ msgstr "�������り注���検査����。\n"
 msgid "Really sign? (y/N) "
 msgstr "本当�署�����? (y/N) "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "署��失敗����: %s\n"
@@ -4348,7 +4498,7 @@ msgstr ""
 "  't' �始�る�信用署� (tsign)�'nr' �始�る�失効��署�\n"
 "  (nrsign)�も����れら�組���� (ltsign, tnrsign, ��)��り��。\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "���失効�れ����。"
 
@@ -4396,7 +4546,7 @@ msgstr "��ユーザIDを本当�削除����? (y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "��主�を本当�移動����? (y/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "�を���り1��択������。\n"
 
@@ -4471,161 +4621,161 @@ msgstr "変更を�存����? (y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "�存���終了����? (y/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "��無変更���更新�����。\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "最後�有効�ユーザID�失効����ん。\n"
 
-#: g10/keyedit.c:2476
+#: g10/keyedit.c:2532
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "ユーザID�失効�失敗����: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "プライマリ・ユーザID�設定�失敗����: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\"�フィンガープリント���り��ん\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" �プライマリ・フィンガープリント���り��ん\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "無効�ユーザID '%s': %s\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "マッ��るユーザID��り��ん。"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "署��るも���り��ん。\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "����よ��署��れ����ん。\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "��署��失効�失敗����: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s'��有効�有効期����り��ん\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\"�正��フィンガープリント���り��ん\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "副�\"%s\"�見��り��ん\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "ダイジェスト: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "機能: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "�サー� 修正���"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "優先�サー�: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "注釈: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x形�ユーザID�優先指定���り��ん。\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "%s�%s�%s�よ��以下����失効�れ���\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "�����%s�%s�よ��失効�能��"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(機密指定)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "作�: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "失効: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "期�切れ: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "有効期�: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "利用法: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "カード番�: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "信用: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "有効性: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "����使用�止�設定�れ����"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4633,17 +4783,17 @@ msgstr ""
 "プログラムを�起動�る���表示�れ���有効性�正�����も�れ���\n"
 "�����を念頭��������。\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "失効"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "期�切れ"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4652,17 +4802,17 @@ msgstr ""
 "*警告*: 主�るユーザID��り��ん。��コマンド��別�\n"
 "              ユーザID�主��る�仮定�る場���り��。\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "*警告*: ����暗�副��も���期�切れ��り��。\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "��有効期�も変更�����ょ�\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4672,70 +4822,70 @@ msgstr ""
 "��\n"
 "        ���を拒��る�も�れ��ん。\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�れ�も追加������? (y/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2形�����フォトIDを追加����ん。\n"
 
-#: g10/keyedit.c:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "�����ユーザID��������存在�����!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "��正��署�を削除����? (y/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "��無効�署�を削除����? (y/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "���明�署�を削除����? (y/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "��自己署�を本当�削除����? (y/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d個�署�を削除����。\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "何も削除�����ん。\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "無効"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ユーザID \"%s\" ��コンパクト��り���: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "ユーザID \"%s\": %d �署��除去�れ���\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ユーザID \"%s\": 既�最�化�れ����\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ユーザID \"%s\": 既�クリーン�������\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4745,209 +4895,209 @@ msgstr ""
 "���\n"
 "        ���を拒��る�も�れ��ん。\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x形�����指�失効者を追加����ん。\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "指�失効者�ユーザIDを入力������: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x形�����指�失効者�任命����ん\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "指�失効者������自体を任命����ん\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "����失効者���も�指��れ����\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "*警告*: �る�を指�失効者�設定�る��元�戻���ん!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "本当����を指�失効者�任命����? (y/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "本当�複数�副��失効期�を変更����? (y/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "副��有効期�を変更���。\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "主��有効期�を変更���。\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3��有効期��変更����ん\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 msgid "Changing usage of a subkey.\n"
 msgstr "副��使用法を変更���。\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 msgid "Changing usage of the primary key.\n"
 msgstr "主��使用法を変更���。\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "署��る副�%s����相互証明�れ����\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "副� %s �署�を������相互証明�必���り��ん\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "ユーザIDを���り����択������。\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ユーザID\"%s\"�v3自己署�をスキップ���\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "優先�サー�URLを入力������: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "本当�置��������? (y/N) "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "本当�削除������? (y/N) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "注釈を入力: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "進����? (y/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d番�ユーザID��り��ん\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "�ッシュ%s�ユーザID��り��ん\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "�ID'%s'�副���り��ん\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d番�副���り��ん\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ユーザID:\"%s\"\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s�%s%s%s�署��れ����\n"
 
-#: g10/keyedit.c:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (エクス�ート��)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "��署��%s�期�切れ��。\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�れ�も本当�失効������? (y/N) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "��署��対�る失効証明書を作�����? (y/N) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�れら�ユーザID��%s�署�����:\n"
 
-#: g10/keyedit.c:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (失効��)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "�����%s�%s�失効�れ����\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "�れら�署�を失効�よ�������:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "失効証明書を本当�作�����? (y/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "秘密���り��ん\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "ユーザID���も�を失効�よ������: %s\n"
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ユーザID\"%s\"��も�失効�れ����\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "*警告*: ユーザID署���%d秒未���\n"
 
-#: g10/keyedit.c:6314
+#: g10/keyedit.c:6370
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "最後�有効�ユーザID�失効����ん。\n"
 
-#: g10/keyedit.c:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "� %s ��も�失効�れ����。\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "副� %s ��も�失効�れ����。\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (大��%ld) ��%s (uid %d) �フォトID���表示\n"
@@ -5405,7 +5555,7 @@ msgstr ""
 "�器��分�エントロピーを供給�る機会を与�る�������。\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "��生��失敗����: %s\n"
@@ -5474,11 +5624,11 @@ msgstr "書�込��能�公開�リング�見��り��ん: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "公開�リング'%s'�書�込�エラー: %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "公開��秘密�を作���署�����。\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5486,34 +5636,34 @@ msgstr ""
 "����暗�化��使用�������注�������。暗�化を行����\n"
 "\"--edit-key\"コマンドを使��副�を生�������。\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "��%lu秒未������� (時間歪曲�時計�障害��ょ�)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "��%lu秒未������� (時間歪曲�時計�障害��ょ�)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注�: v3��対�る副��作���OpenPGP������ん\n"
 
-#: g10/keygen.c:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主��秘密部分�利用����ん。\n"
 
-#: g10/keygen.c:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主��秘密部分�カード上��存�れ����。\n"
 
-#: g10/keygen.c:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "本当�作�����? (y/N) "
 
@@ -5714,82 +5864,82 @@ msgstr "�を'%s'�ら�求\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "*警告*: URI %s �らデータを�れ��ん: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "変�長��暗�化済�セッション� (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 暗�化済�セッション�\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "�明�ダイジェスト・アルゴリズム�生��れ�パスフレーズ %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "公開��%s��\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公開��よる暗�化済�データ: 正��DEK��\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-ビット%s�, ID %s, 日付%s�暗�化�れ���\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s�, ID %s�暗�化�れ���\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公開��復��失敗����: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "*警告*: 複数�プレインテクスト�見られ��\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu 個�パスフレーズ�暗�化\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 個�パスフレーズ�暗�化\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s暗�化済�データを仮定\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA暗�方��利用�能����楽天的���%s�代用�よ�������\n"
 
-#: g10/mainproc.c:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "*警告*: メッセージ�完全性��護�れ����ん\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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"
@@ -5799,179 +5949,179 @@ msgstr ""
 "��メッセージ���ら�正当��ょ�。当時�整�性��護機能�\n"
 "広�使�れ�����������。\n"
 
-#: g10/mainproc.c:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "�れ�も復��る��オプション '%s' を使���。\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "復��強制的�失敗��れ���!\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "復���功\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "*警告*: 暗�化�れ�メッセージ�改竄�れ����!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "復��失敗����: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "注�: �信者�\"極秘��る\"よ��求�����\n"
 
-#: g10/mainproc.c:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "元�ファイル�='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "スタンドアロン失効 - \"gpg --import\"を使���用������\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "署��見��り��ん\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\"�ら�*�正�*署�"
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\"�ら�期�切れ�署�"
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"�ら�正��署�"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "署��検証を�略\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "�������署�データ��り扱���ん\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�施�れ�署�\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s�%sを使用\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s�%s�ID %s�施�れ�署�\n"
 
-#: g10/mainproc.c:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               発行者\"%s\"\n"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "以下����り��: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "注�: ��情報を利用�る�� '%s' を使������\n"
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[�確定]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                別�\"%s\""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "*警告*: ����%sモード��署������ん!\n"
 
-#: g10/mainproc.c:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "期�切れ�署� %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "��署��%s�期�切れ��り��\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s署��ダイジェスト・アルゴリズム %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "�イナリ"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "テキストモード"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "�明�"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr "��アルゴリズム "
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 "*警告*: 分�署����り��ん。ファイル「%s��検証�れ*��ん���*!\n"
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "署�を検査����ん: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "分�署���り��ん\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "*警告*: 多�署��検出。最��も���検査���。\n"
 
-#: g10/mainproc.c:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "クラス0x%02x�スタンドアロン署�\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "��形� (PGP 2.x) �署�\n"
@@ -6036,34 +6186,34 @@ msgstr "(報告�れ�エラー: %s <%s>)\n"
 msgid "(further info: "
 msgstr "(より詳細�情報: "
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 廃止�れ�オプション\"%s\"\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "*警告*: \"%s\"��廃止�れ�オプション��\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "\"%s%s\"を代�り�使������\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "*警告*: \"%s\" ��廃止�れ��るコマンド�� - 使��������\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 "%s:%u: \"%s\"����ファイル�使�れ���り��� - %s��ん�効果も�り�"
 "�ん\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@ -6071,36 +6221,36 @@ msgstr ""
 "*警告*: \"%s%s\"��使�れ�����オプション�� - %s以外��ん�効果も�り"
 "��ん\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "無圧縮"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "無圧縮|��"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "��メッセージ��%s��使用����ん\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "�����オプション'%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "�明�オプション'%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "ECDSA�公開��8ビット��数�SECエンコーディングを期待���\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "�明�弱�ダイジェスト'%s'\n"
@@ -6133,22 +6283,22 @@ msgstr "標準出力�書�込���\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "署��れ�データ�'%s'��る�想定���\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "公開��アルゴリズム%d���り扱���ん\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "*警告*: 潜在的�セキュア���共通�暗�化セッション���\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "�明�クリティカル�署�注釈: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "型%d�下�パケット�クリティカル・ビットを発見\n"
@@ -6553,12 +6703,12 @@ msgstr "デフォルト���人\"%s\"��明��\n"
 msgid "no valid addressees\n"
 msgstr "有効�宛先��り��ん\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "注�: �%s�� %s �機能��り��ん\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "注�: �%s��%s�対�る優先指定��り��ん\n"
@@ -6826,7 +6976,7 @@ msgstr "�%sを署�����%sモード�使��������ん\n
 #: g10/sig-check.c:82
 #, c-format
 msgid "continuing verification anyway due to option %s\n"
-msgstr ""
+msgstr "オプション %s ���検証を続���\n"
 
 #: g10/sig-check.c:190
 #, c-format
@@ -6972,7 +7122,7 @@ msgstr "スキップ: 秘密��も��り��\n"
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "�れ�PGP�生���Elgamal���署�用��安全���り��ん!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信用レコード%lu, 型%d: 書�込��失敗����: %s\n"
@@ -7017,7 +7167,7 @@ msgstr "'%s'�信用レコード�検索エラー: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "'%s'�読�込�エラー: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信用データベース: �期�失敗����: %s\n"
@@ -7501,143 +7651,143 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s'��有効�大型�ID��り��ん\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "�%s: 信用�る����������\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "�%s�信用データベース�複数�り��\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "�%s: 信用�れる��公開���り��ん - スキップ���\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "�%sを究極的�信用�るよ�記録����\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信用レコード%lu, リクエスト型%d: 読�込��失敗����: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信用レコード%lu��求�れ�型%d���り��ん\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "trustdbを下記�コマンド��生��る��を試��������:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "も���れ����������ら�マニュアルを�覧����\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "�明�信用モデル (%d) �使���ん - %s信用モデルを仮定\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s信用モデルを使用\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "信用データベース�検査������\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "次回�信用データベース検査��%s��\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "信用モデル'%s'�信用データベース�検査������\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "信用モデル'%s'�信用データベース�更新������\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "公開�%s�見��り��ん: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "--check-trustdbを実行������\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "信用データベース�検査\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d個��を処�"
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (��%d本�有効性数をクリア)\n"
 
-#: g10/trustdb.c:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "究極的�信用�る��見��り��ん\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "究極的�信用�る�%s�公開��見��り��ん\n"
 
-#: g10/trustdb.c:2209
+#: g10/trustdb.c:2252
 #, 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:2290
+#: g10/trustdb.c:2333
 #, 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 "究極"
 
@@ -7649,39 +7799,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 "[  究極  ]"
 
@@ -7729,33 +7879,33 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%s番�: %s%%0A��者: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "残�れ�試行回数: %d"
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|管�者PINを入力������"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|標準���PIN Unblocking Code (PUK)を入力������。"
 
-#: scd/app-p15.c:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||PINを標準������入力������。"
 
@@ -7822,7 +7972,7 @@ msgstr "指紋��管�失敗����: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "生�日��管�失敗����: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "カード�らCHVステイタス��得�エラー\n"
@@ -7887,7 +8037,7 @@ msgstr "CHV%d�PIN�短����。最短�%d��\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d��証�失敗����: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "カード�永久�ロック�れ���!\n"
@@ -8026,13 +8176,13 @@ msgstr "カードã�¯ãƒ€ã‚¤ã‚¸ã‚§ã‚¹ãƒˆãƒ»ã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ  %s をサãƒ�ートã�
 msgid "signatures created so far: %lu\n"
 msgstr "�れ���作��れ�署�: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "管�者PIN�確����コマンド��今�����止�れ����\n"
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�アクセス����ん - 無効�OpenPGPカード?\n"
@@ -8048,55 +8198,55 @@ msgstr "||PINをリーダ�ピンパッド�入力������"
 msgid "|N|Initial New PIN"
 msgstr "|N|�期�新��PIN"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "マル�・サー�・モード(フォアグラウンド)�実行"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|デ�ッグ・レベルをLEVEL����"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|FILE�ログを書�出���"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|�ートN�リーダ�接続���"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|ct-APIドライ����NAMEを用���"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|PC/SCドライ����NAMEを用���"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "内蔵CCIDドライ�を使���ん"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|N秒アクティブ���場��カード��接続を切り��"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "リーダ�ピンパッドを使���"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "管�カード・コマンド�使用を拒�"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "ピンパッド��変長入力を使�"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "管�カード・コマンド�使用を拒�"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "使�方: @SCDAEMON@ [オプション] (ヘルプ� -h)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8104,23 +8254,29 @@ msgstr ""
 "形�: scdaemon [オプション] [コマンド [引数]]\n"
 "@GNUPG@�Smartcardデーモン\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "'--daemon'オプションを使���プログラムを�ックグラウンド�実行�����"
 "�\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d��ンドラ�開始�れ���\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d��ンドラ�終了����\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "�使用情報��得エラー: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8178,7 +8334,7 @@ msgstr "発行者�外部ロケーションを調�����\n"
 msgid "number of issuers matching: %d\n"
 msgstr "マッ��る発行者�数: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "authorityInfoAccessを�得����ん: %s\n"
@@ -8340,7 +8496,7 @@ msgstr "ルート証明書�信用��る�マーク�れ����ん"
 msgid "checking the trust list failed: %s\n"
 msgstr "信用リスト�検査�失敗����: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "証明書��ェイン�長����\n"
@@ -8394,7 +8550,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%uビット�ッシュ�%uビット�%s���無効��\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8405,7 +8561,7 @@ msgstr "メモリ��り��ん\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(�れ�MD2アルゴリズム��)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "none"
 
@@ -8440,42 +8596,37 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "作� %s, 有効期� %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "��使�方�指定�れ����ん - ����使��を仮定���\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "�使用情報��得エラー: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "証明書�証明����使�れる�����り��ん���\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "証明書�OCSP応答�署�����使�れる�����り��ん���\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "証明書�暗�化����使�れる�����り��ん���\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "証明書�署�����使�れる�����り��ん���\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "証明書�暗�化����使���ん\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "証明書�署�����使���ん\n"
@@ -8663,6 +8814,11 @@ msgstr "自己署�証明書を作�����? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "下記�パラメータ�使�れ��:\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "一時ファイル�作�エラー: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "今�自己署�証明書を作������。  "
@@ -8738,123 +8894,123 @@ msgstr "証明書'%s'�削除�失敗����: %s\n"
 msgid "no valid recipients given\n"
 msgstr "有効����り手�指定�れ����ん\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "外部�を一覧�る"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "証明書��ェインを表示�る"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "証明書をイン�ート�る"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "証明書をエクス�ート�る"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "スマートカードを登録�る"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "dirmngr�コマンドを渡�"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-toolを起動�る"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "base-64形��出力を作�"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "端末を����使���"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|インクルード�る証明書�数"
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|�リシー情報をFILE�ら�得�る"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "PEMフォーマット�入力を仮定�る"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "base-64フォーマット�入力を仮定�る"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "�イナリ・フォーマット�入力を仮定�る"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "base-64形��出力を作�"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|USER-IDをデフォルト�秘密����使�"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|�リングを�リング�リスト�追加"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "紛失���る発行者証明書を�得�る"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|PKCS#12�パスフレーズ�NAME�エンコーディングを使�"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "決��CRLを調���"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "ルート証明書�CRLを�ェック���"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "OCSPを用��有効性を確��る"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|インクルード�る証明書�数"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|FILE|�リシー情報をFILE�ら�得�る"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "証明書�リシーを�ェック���"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "紛失���る発行者証明書を�得�る"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "端末を����使���"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|FILE|サー�・モード�ログをFILE�書�出�"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|暗�アルゴリズム�NAMEを使用"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FILE|監査ログをFILE�書�出�"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|ダイジェスト・アルゴリズム�NAMEを使用"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "�ッ�・モード: ��もユーザ��������"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "��ん��設��yesを仮定�る"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "��ん��設��noを仮定�る"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FILE|�リングを�リング�リスト�追加"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|USER-ID|USER-IDをデフォルト�秘密����使�"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|��キーサー�を��検索�使�"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|暗�アルゴリズム�NAMEを使用"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAME|ダイジェスト・アルゴリズム�NAMEを使用"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|監査ログをFILE�書�出�"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "使�方: @GPGSM@ [オプション] [ファイル] (ヘルプ� -h)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8864,27 +9020,27 @@ msgstr ""
 "S/MIMEプロトコルを用���署��検査�暗�化や復�を行���\n"
 "デフォルト��作��入力データ��存���\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "注�:'%s'�対��暗�化����ん: %s\n"
 
-#: sm/gpgsm.c:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "�明�検証モデル '%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "共通証明書�イン�ート・エラー: %s\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "'%s'を用��署�����ん: %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無効�コマンド (暗黙�コマンド��り��ん)\n"
@@ -8944,7 +9100,7 @@ msgstr "証明書��検索��題: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "フラグ��存エラー: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "エラー - "
 
@@ -8980,7 +9136,7 @@ msgstr ""
 "\n"
 "%s%s本当��れを望����?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9032,24 +9188,24 @@ msgstr "[日時指定��]"
 msgid "algorithm:"
 msgstr "アルゴリズム:"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 "無効�署�: メッセージ・ダイジェスト�属性�計算�れ�も��一致���ん\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "正��署�"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "      別�"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "�れ��定署���\n"
@@ -9826,112 +9982,135 @@ msgstr "絶対ファイル�����\n"
 msgid "looking up '%s'\n"
 msgstr "'%s'を検索���\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "CRLキャッシュ�内容をリスト���"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|FILE�らCRLをキャッシュ�ロード�る"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|URL�らCRLを�得���"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "dirmngrをシャットダウン�る"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "キャッシュをフラッシュ���"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|FILE|FILE�サー�・モード�ログを書�出�"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr "オンライン�ソフトウェア・�ージョン・�ェックを許�"
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "ユーザ���������実行"
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr "|N|一��クエリ�Nを越�る�アイテムを返���"
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
-msgstr "期日����CRL�ロードを強制�る"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr "�ットワーク関連オプション"
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "OCSP�求��信を��る"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
+msgstr "�ットワーク・トラフィックを���Tor経由��る"
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
-msgstr "オンライン�ソフトウェア・�ージョン・�ェックを許�"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "キーサー��コンフィグレーション"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|�サー����URLを使用"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+msgstr "|FILE|FILE��るCA証明書をTLS��HKP�使�"
+
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr "HTTPサー��コンフィグレーション"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "HTTP�使用を�止�る"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "LDAP�使用を�止�る"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr "HTTP CRL�布�イントを無視�る"
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
-msgstr "LDAP CRL�布�イントを無視�る"
-
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "OCSPサービスURL�入���る証明書を無視�る"
-
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|����HTTPリクエストをURL�リダイレクト�る"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "システム�HTTPプロキシ設定を用���"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "使用�るLDAPサー��コンフィグレーション"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "LDAP�使用を�止�る"
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr "LDAP CRL�布�イントを無視�る"
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|LDAP�������HOSTを使�"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "--ldap-proxy �フォール�ック・ホストを使���"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|��キーサー�を��検索�使�"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|FILE�らLDAPサー�リストを読�込���"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "CRL�布�イント�発見�れ�新��サー�を serverlist �追加�る"
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|LDAP�タイムアウトをN秒��る"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "OCSP�コンフィグレーション"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "OCSP�求��信を��る"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "OCSPサービスURL�入���る証明書を無視�る"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|OCSP応答���URLを使用"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|FPR�署��れ�OCSPレス�ンス"
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
-msgstr "|N|一��クエリ�Nを越�る�アイテムを返���"
-
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr "|FILE|FILE��るCA証明書をTLS��HKP�使�"
-
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
-msgstr "�ットワーク・トラフィックを���Tor経由��る"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "期日����CRL�ロードを強制�る"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -9940,11 +10119,11 @@ msgstr ""
 "@\n"
 "(コマンド�オプション全部�一覧��\"info\" マニュアルを�覧����)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "使�方: @DIRMNGR@ [オプション] (ヘルプ� -h)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -9952,83 +10131,83 @@ msgstr ""
 "形�: @DIRMNGR@ [オプション] [コマンド [引数]]\n"
 "@GnuPG@��サー��CRL�OCSPアクセス\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有効�debugレベル�: %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "使�方: %s [オプション] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "コロン�ソケット��許�れ��ん\n"
 
-#: dirmngr/dirmngr.c:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "'%s'�らCRL��得�失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "'%s'�らCRL�処��失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 行�長���� - スキップ�れ���\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 無効�フィンガープリント�検出�れ���\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 読�込�エラー: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 行末�ゴミを無視\n"
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUPを���り - 設定を読�直��キャッシュをフラッシュ\n"
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2を���り - 動作�定義�れ��\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERMを���り - シャットダウン...\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERMを���り - %d本�アクティブ�接続����り��\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "強制的�シャットダウン�る\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINTを���り - ���シャットダウン\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "シグナル%dを���り - アクション�定義�れ��\n"
@@ -10218,91 +10397,91 @@ msgstr "'%s'�対�るOCSP応答��ッシング�失敗����: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "デフォルトOCSP署�者�証明�署��れ����ん"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "リスト項目�確��失敗����: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "応答ID��得エラー: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "発行者証明書�見��り��ん: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "呼出��対象�証明書を返���ん���\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "呼出��発行�れる証明書を返���ん���\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "OCSPコンテクスト�確��失敗����: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "デフォルトOCSPレス�ンダ�定義�れ����ん\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "デフォルト�OCSP署�者�定義�れ����ん\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "デフォルトOCSP応答'%s'を使���\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "OCSP応答'%s'を使���\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "対象�証明書�OCSPステイタス��得エラー: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "証明書ステイタス�: %s (�れ=%s 次=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr "良好"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "証明書�失効済���: %s (�由: %s)\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OSCPレス�ンダ�未��ステイタスを返����\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OSCPレス�ンダ��在���ステイタスを返����\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OSCPレス�ンダ����るステイタスを返����\n"
@@ -10312,67 +10491,67 @@ msgstr "OSCPレス�ンダ����るステイタスを返����\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s)�失敗����: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "serialno�cert ID��り��ん"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire�失敗����: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url �失敗����: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "データ�信エラー: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch �失敗����: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert �失敗����: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d を越����\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "制御構造を確�����ん: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "assuanコンテクスト�確��失敗����: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "サー���期化�失敗����: %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "Assuan�登録コマンド�失敗����: %s\n"
 
-#: dirmngr/server.c:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept ��題: %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan�処��失敗����: %s\n"
@@ -10415,7 +10594,7 @@ msgstr "証明書�ェイン�正����\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "証明書�CRL署�����使�れる�����り��ん���\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "�����"
 
@@ -10508,276 +10687,132 @@ msgstr "行��信�失敗����: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "標準オプションを�信エラー: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "診断出力を制御�るオプション"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "コンフィグレーションを制御�るオプション"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "デ�ッグ����有用�オプション"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "セキュリティを制御�るオプション"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|N秒後�SSH�を無効��る"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|最大PINキャッシュ存続時間をN秒��る"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|最大SSH�存続時間をN秒��る"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "パスワード・�リシー�強制オプション"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "パスワード・�リシーを迂回�る��を����"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|新��パスフレーズ�必���る最低長をN��る"
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-"|N|新��パスフレーズ���アルファベット���キャラクタを最低N必���る"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|FILE|新��パスフレーズをFILE�パターン�対���ェック�る"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|N日後�パスフレーズを期�切れ��る"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "��パスフレーズを�使用�る��を����"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|Pinentry�タイムアウトをN秒��る"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|デフォルト�秘密����NAMEを用�る"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAME|ユーザID NAME�も暗�化�る"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|電�メールエイリアスを設定�る"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "キーサー��コンフィグレーション"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL|�サー����URLを使用"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "PKA検索(DNS�求)を��る"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MECHANISMS|メールアドレス�よ���を特定�る際�MECHANISMSを使用�る"
-
-#: tools/gpgconf-comp.c:764
-msgid "import missing key from a signature"
-msgstr "署��ら手元����をイン�ート�る"
-
-#: tools/gpgconf-comp.c:767
-msgid "include the public key in signatures"
-msgstr "署��公開�を��る"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "dirmngr������アクセスを無効��る"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAME|PKCS#12�パスフレーズ�NAME�エンコーディングを使�"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "ルート証明書�CRLを�ェック���"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "出力フォーマットを制御�るオプション"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "インタラクティビティ�強制を制御�るオプション"
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr "Tor�使用を制御�るオプション"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "HTTPサー��コンフィグレーション"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "システム�HTTPプロキシ設定を用���"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "使用�るLDAPサー��コンフィグレーション"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "LDAPサー�・リスト"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "OCSP�コンフィグレーション"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr "プライベート�"
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr "スマートカード"
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr "�ットワーク"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr "パスフレーズ入力"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "コン�ー�ント�起動�る����切���り��ん"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "コン�ー�ント%s�コンフィグレーション・ファイル�壊れ����\n"
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "注�: \"%s%s\"コマンドを使��詳細を得�����。\n"
 
-#: tools/gpgconf-comp.c:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "コン�ー�ント%s�外部�検証�失敗����"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "グループ仕様�無視�れ��る���注�������\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "'%s'�クローズ�エラー\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "'%s'�パーズ�エラー\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "����コン�ー�ントをリスト�る"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "����プログラムを�ェック�る"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|オプションをリスト�る"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|オプションを変更�る"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|オプションを�ェック�る"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "グロー�ル・デフォルト値を�用�る"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|FILEを使��コンフィグレーション・ファイルを更新�る"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "@GPGCONF@����コンフィグレーション・ディレクトリを�得�る"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "グロー�ル�コンフィグレーション・ファイルをリスト�る"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "グロー�ル�コンフィグレーション・ファイルを�ェック�る"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr "ソフトウェア・�ージョン・データベース������る"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "�����る��指定�れ�コン�ー�ントをリロード�る"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "指定�れ�コン�ー�ントを起動�る"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "指定�れ�コン�ー�ントをkill�る"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "出力ファイル���使用"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "�能�場��実行時�変更を有効��る"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "使�方: @GPGCONF@ [オプション] (ヘルプ� -h)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10785,15 +10820,15 @@ msgstr ""
 "形�: @GPGCONF@ [オプション]\n"
 "@GNUPG@システム�ツール�対�コンフィグレーション・オプションを管��る\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "一�コン�ー�ント引数�必���"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "コン�ー�ント�見��り��ん"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "引数�許��れ����ん"
 
@@ -10809,6 +10844,36 @@ msgstr ""
 "形�: gpg-check-pattern [オプション] パターンファイル\n"
 "パターンファイル�対��標準入力�パスフレーズを確��る\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "一時ファイル�書�込�エラー: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "サー��ログ・ファイルを使�"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|FILE|サー�・モード�ログをFILE�書�出�"
+
+#~ msgid "run without asking a user"
+#~ msgstr "ユーザ���������実行"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "PKA検索(DNS�求)を��る"
+
+#~ msgid "import missing key from a signature"
+#~ msgstr "署��ら手元����をイン�ート�る"
+
+#~ msgid "include the public key in signatures"
+#~ msgstr "署��公開�を��る"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "出力フォーマットを制御�るオプション"
+
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Tor�使用を制御�るオプション"
+
+#~ msgid "LDAP server list"
+#~ msgstr "LDAPサー�・リスト"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "�%sを%s�らサー�%s��求\n"
 
@@ -10981,9 +11046,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "%sを書�込��オープン����ん���: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "'%s'�書�込�エラー: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "'%s'�読�込�エラー: %s\n"
 
@@ -11136,9 +11198,6 @@ msgstr ""
 #~ msgid "listen() failed: %s\n"
 #~ msgstr "listen() �失敗����: %s\n"
 
-#~ msgid "do not grab keyboard and mouse"
-#~ msgstr "キーボード�マウスを�有���"
-
 #~ msgid "Error: URL too long (limit is %d characters).\n"
 #~ msgstr "エラー: URL�長���� (上�%d文字)。\n"
 
diff --git a/po/nb.gmo b/po/nb.gmo
index 215b71a..240277e 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index fcfa316..725f975 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -146,8 +146,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Passordfrase:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "feil. Prøv igjen"
 
@@ -192,62 +192,92 @@ msgstr "Ugyldig PIN"
 msgid "Bad Passphrase"
 msgstr "Ugyldig passordfrase"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "feil under henting av kort-serienummer: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Skriv inn denne passordfrasen på nytt"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase to protect the imported object within the "
+#| "GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Skriv inn passordfrase for å låse nytt importert objekt i GnuPG-systemet."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nøkler som er lenger enn %d bit støttes ikke\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "klarte ikke å lage «%s»: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "klarte ikke å åpne «%s»: %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "feil under henting av kort-serienummer: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "oppdaget kort med serienummer %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "ingen ssh-autentiseringnøkkel på kort: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "fant ingen passende kortnøkkel: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "feil under henting av kortliste: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -256,24 +286,20 @@ msgstr ""
 "En ssh-prosess ber om tillatelse til å brukt nøkkel%%0A  %s%%0A  (%s)%%0AVil "
 "du tillate dette?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "Tillat"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "Avvis"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Skriv inn passordfrase for ssh-nøkkel%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Skriv inn denne passordfrasen på nytt"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -282,98 +308,94 @@ msgstr ""
 "Skriv inn passordfrase som skal brukes til å beskytte mottatt hemmelig nøkkel"
 "%%0A   %s%%0A   %s%%0Ai nøkkellageret for gpg-agent"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "klarte ikke å lage strøm av sokkel: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "Sett inn kort med serienummer"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "Fjern gjeldende kort og sett inn kort med serienummer"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "Admin-PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Tilbakestillingskode"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0ABruk leserens kodeplate til å skrive."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Gjenta tilbakestillingskode"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "Gjenta PUK"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Gjenta PIN"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Tilbakestillingskode ble ikke gjentatt korrekt. Prøv igjen"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK-kode ble ikke gjentatt korrekt. Prøv igjen"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN ble ikke gjentatt korrekt. Prøv igjen"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Skriv inn PIN-kode%s%s%s for å låse opp kort"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "feil under oppretting av midlertidig fil: %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "feil under skriving til midlertidig fil: %s\n"
+#: agent/genkey.c:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "feil under skriving til %s: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Skriv inn ny passordfrase"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "Bruk denne likevel"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, 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:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -382,18 +404,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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Ja, beskyttelse er unødvendig"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, 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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -401,157 +423,230 @@ 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:323
+#: agent/genkey.c:309
 #, 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:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Advarsel: du har skrevet inn en svak passordfrase."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Skriv inn passordfrase for å%0Abeskytte ny nøkkel"
 
-#: agent/genkey.c:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Skriv inn ny passordfrase"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Valg:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+#, fuzzy
+#| msgid "Options useful for debugging"
+msgid "Options used for startup"
+msgstr "Nyttige feilsøkingsvalg"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "kjør som bakgrunnsprosess («daemon»)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "kjør i tjenermodus (forgrunn)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr "kjør i «supervised» modus"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "detaljert utskrift"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "være noenlunde stille"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "ikke løsne fra konsoll"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "sh-utdata for kommandoer"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "csh-utdata for kommandoer"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|les valg fra valgt FIL"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "ikke løsne fra konsoll"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Styring av diagnostikk-utdata"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "bruk loggfil for tjeneren"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "detaljert utskrift"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "være noenlunde stille"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|bruk PGN som SCdaemon-program"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
+
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Oppsettsvalg"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "ikke bruk SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|bruk PGN som SCdaemon-program"
+
+#: agent/gpg-agent.c:213
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|godta enkelte kommandoer via «NAME»"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorer forespørsler om å bytte TTY"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorer forespørsler om å bytte X-skjerm"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "slå på ssh-støtte"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|ALGO|bruk valgt ALGOritme til å vise ssh-fingeravtrykk"
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "slå på støtte for putty"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Sikkerhetsvalg"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|fjern hurtiglagrede PIN-koder etter N sekunder"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|SSH-nøkler utgår etter N antall sekunder"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr ""
+"|N|endre maksimal livstid for PIN-koder i hurtiglager til N antall sekunder"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|endre maksimal livstid for SSH-nøkler til N antall sekunder"
+
+#: agent/gpg-agent.c:248
 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:250
 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:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "ikke la klienter tillitsmarkere nøkler"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 msgid "allow presetting passphrase"
 msgstr "tillat valg av passordfrase på forhånd"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Valg som håndhever passordfrase-regler"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "ikke tillat avvik fra passordregler"
+
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|endre minimal passordfrase-lengde til N"
+
+#: agent/gpg-agent.c:269
+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:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FIL|kontroller nye passordfraser mot mønster i valgt FIL"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|regn passord som ugyldig etter N antall dager"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "ikke tillat gjenbruk av gamle passordfraser"
+
+#: agent/gpg-agent.c:281
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the PIN-Entry"
+msgstr "Sikkerhetsvalg"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
+msgstr ""
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr "ikke la kaller overstyre PIN-inntasting"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
-msgstr "la brukeren skrive inn passordfrase via Emacs"
+#: agent/gpg-agent.c:287
+#, 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:258
-msgid "enable ssh support"
-msgstr "slå på ssh-støtte"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "|ALGO|bruk valgt ALGOritme til å vise ssh-fingeravtrykk"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|endre tidsavbrudd for PIN-inntasting til N antall sekunder"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "slå på støtte for putty"
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapporter programfeil til <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Bruk: @GPG_AGENT@ [valg] («-h» for hjelp)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -559,135 +654,143 @@ msgstr ""
 "Syntaks: @GPG_AGENT@ [valg] [kommando [arg]]\n"
 "Håndtering av hemmelige nøkler for @GNUPG@\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg kontrollsum-algoritme er ugyldig\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "leser valg fra «%s»\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Merk: «%s» regnes ikke som et valg\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "klarte ikke å lage sokkel: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "sokkelnavnet «%s» er for langt\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "feil under henting av sokkel-anledning\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "feil under knytning av sokkel til «%s»: %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "lytter på sokkel «%s»\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "klarte ikke å lage mappa «%s»: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "mappa «%s» er opprettet\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() mislyktes for «%s»: %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "«%s» kan ikke brukes som hjemmemappe\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, 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:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "startet behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "avsluttet behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, 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:2824
+#: agent/gpg-agent.c:2806
 #, 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:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect mislyktes: %s - venter 1s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppet\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kjører i gjeldende økt\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Valg:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Bruk: gpg-preset-passphrase [valg] NØKKELGREP («-h» for hjelp)\n"
@@ -700,8 +803,8 @@ msgstr ""
 "Syntaks: gpg-preset-passphrase [valg] KEYGRIP\n"
 "Vedlikehold av hurtiglager for passord\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -709,9 +812,8 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -766,43 +868,43 @@ msgstr "avbrutt\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "feil under spørring etter passordfrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "feil under åpning av «%s»: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fil «%s», linje %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "uttrykk «%s» ignorert i «%s», linje %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system-tillitsliste «%s» er ikke tilgjengelig\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "ugyldig fingeravtrykk i «%s», linje %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "ugyldig nøkkelvalg i «%s», linje %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "feil under lesing av «%s», linje %d: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "feil under lesing av liste over tillitsmerkede rotsertifikater\n"
@@ -815,7 +917,7 @@ msgstr "feil under lesing av liste over tillitsmerkede rotsertifikater\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -824,11 +926,11 @@ msgstr ""
 "Stoler du fullstendig på at%%0A  «%s»%%0Asertifiserer brukersertifikater "
 "korrekt?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "Nei"
@@ -841,7 +943,7 @@ msgstr "Nei"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -851,21 +953,21 @@ msgstr "Kontroller at sertifikatet%%0A  «%s»%%0Ahar fingeravtrykket%%0A  %s"
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "Riktig"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "Feil"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Merk: denne passordfrasen har aldri blitt endret.%0AEndre den umiddelbart."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -874,15 +976,15 @@ msgstr ""
 "Denne passordfrasen har ikke blitt endret%%0Asiden %.4s-%.2s-%.2s. Endre den "
 "umiddelbart."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Endre passordfrase"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "Jeg endrer senere"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -890,11 +992,11 @@ msgid ""
 msgstr ""
 "Er du sikker på at du vil slette nøkkel med nøkkelgrep%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "Slett nøkkel"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -928,7 +1030,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "offentlig nøkkelalgoritme %d (%s) støttes ikke\n"
@@ -943,53 +1045,53 @@ msgstr "beskyttelsesalgoritme %d (%s) støttes ikke\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "kontrollsum-algoritme for beskyttelse %d (%s) støttes ikke\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "feil under opprettelse av datarør: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "feil under opprettelse av strøm for datarør: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "feil under kopiering av prosess: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "prosess %d avsluttet ikke i tide: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr ""
 "feil under kjøring av «%s». Programmet er sannsynligvis ikke installert\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "feil under kjøring av «%s». Avslutningskode %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "feil under kjøring av «%s». Avsluttet\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "venting på avslutning av prosesser mislyktes: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "feil under henting av prosess-avslutningskode %d: %s\n"
@@ -1019,12 +1121,12 @@ msgstr "Advarsel: utrygt eierskap til %s «%s»\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Advarsel: utrygge tillatelser til %s «%s»\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "venter på at fila «%s» skal bli tilgjengelig …\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
@@ -1084,22 +1186,22 @@ 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:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "feil under tildeling av minne: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: valget «%s» er utgått, og har nå ingen effekt\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "ADVARSEL: valget «%s%s» er utgått, og har ingen effekt\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "unknown debug flag '%s' ignored\n"
@@ -1407,7 +1509,7 @@ msgstr "ugyldig valg"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "valget «%.50s» mangler et argument\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "ugyldig argument for valget «%.50s»\n"
@@ -1437,17 +1539,17 @@ msgstr "kommandoen «%.50s» er flertydig\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "valget «%.50s» er ugyldig\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "valgfil «%s»: %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1467,41 +1569,41 @@ msgstr "iconv_open mislyktes: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konvertering fra «%s» til «%s» mislyktes: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "klarte ikke å lage midlertidig fil «%s»: %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "feil under skriving til «%s»: %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "fjerner ødelagt låsfil (laget av %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "venter på lås (holdt igjen av %d%s) %s …\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(vranglås?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "lås «%s» ikke opprettet: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "venter på lås %s …\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s er for gammel (krever %s, har %s)\n"
@@ -1733,23 +1835,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "lag opphevelsessertifikat"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Oppdaget OpenPGP-kortnummer %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1765,8 +1867,8 @@ msgstr "Denne kommandoen er bare tilgjengelig for kort av versjon 2\n"
 msgid "Reset Code not or not anymore available\n"
 msgstr "Tilbakestillingskode er ikke tilgjengelig\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1776,120 +1878,120 @@ msgstr "Ditt valg? "
 msgid "[not set]"
 msgstr "[ikke valgt]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Feil: Bare ren ASCII er foreløpig tillatt.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Feil: tegnet «<» kan ikke brukes.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "Adresse for henting av offentlig nøkkel: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "feil under lesing av «%s»: %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "feil under skriving av «%s»: %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Språkoppsett: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Feil: oppsettsstreng har ugyldig lengde.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Feil: oppsettsstreng inneholder ugyldige tegn.\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig svar.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Feil: feilformatert fingeravtrykk.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "klarte ikke å utføre nøkkelhandling: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "feil under henting av nøkkelinfo: %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende nøkkel? (j/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1899,107 +2001,107 @@ 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:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvor stor skal nøkkelen være? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bit\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s nøkkelstørrelser må ligge i rekkevidden %u-%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Signaturnøkkel\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Krypteringsnøkkel\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Autentiseringsnøkkel\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Velg hvilken type nøkkel du vil ha:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 #| msgid "   (%d) ECC and ECC\n"
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC og ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, 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:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Lage sikkerhetskopi av krypteringsnøkler utenfor kortet? (J/n) "
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstatte eksisterende nøkler? (j/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2010,172 +2112,172 @@ msgstr ""
 "   PIN = «%s»     Admin-PIN = «%s»\n"
 "Du bør endre disse med kommandoen «--change-pin»\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 msgid "Please select the type of key to generate:\n"
 msgstr "Velg hvilken type nøkkel du vil lage:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signaturnøkkel\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnøkkel\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnøkkel\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "velg hvor nøkkelen skal lagres:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD mislyktes: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr "Vil du fortsette? (j/N) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Er du sikker på at du vil gjenopprette fabrikkoppsett? (skriv «ja») "
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, 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:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "gå ut av denne menyen"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "vis admin-kommandoer"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "vis denne hjelpeteksten"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "endre adresse for å hente nøkkel"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "hent nøkkel som ligger i kortets adresse"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "endre brukernavn"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "endre språkoppsett"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "endre kortholders kjønn"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "endre CA-fingeravtrykk"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "slå av på tvungen bruk av signatur-PIN"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "lag nye nøkler"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "meny for å endre eller fjerne blokkering av PIN"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "fjern PIN-blokkering med en tilbakestillingskode"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr "ødelegg alle nøkler og data"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|NAVN|bruk valgt brukerNAVN til autentisering"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "endre eiertillit"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/kort> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (prøv «help»)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "«--output» virker ikke med denne kommandoen\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "klarte ikke å åpne «%s»\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "fant ikke nøkkelen «%s»: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2235,8 +2337,8 @@ msgid "subkey"
 msgstr "undernøkkel"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
@@ -2276,24 +2378,24 @@ msgstr "klarte ikke å bruke symmetrisk ESK-pakke på grunn av S2K-modus\n"
 msgid "using cipher %s\n"
 msgstr "bruker krypteringsmetode %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "«%s» er allerede komprimert\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "ADVARSEL: «%s» er en tom fil\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
@@ -2316,7 +2418,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "ADVARSEL: nøkkel %s egner seg ikke for kryptering i %s-modus\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2325,32 +2433,32 @@ msgstr ""
 "ADVARSEL: tvungen bruk av komprimeringsalgoritme %s (%d) bryter med "
 "mottakers oppsett\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "tvungen bruk av krypt.metode %s (%d) bryter med mottakers oppsett\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kryptert for: «%s»\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruke valget «%s» i %s-modus\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterte data\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kryptert med en ukjent algoritme %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2358,7 +2466,7 @@ msgstr ""
 "ADVARSEL: meldinga ble kryptert med svak nøkkel for symmetrisk "
 "krypteringsmetode.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem ved håndtering av kryptert pakke\n"
@@ -2540,214 +2648,272 @@ msgstr "Ugyldig nøkkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruker undernøkkel %s i stedet for primærnøkkel %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "følgende verdier er gyldige for «%s»:\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "lag signatur"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "lag klartekst-signatur"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "lag adskilt signatur"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "krypter data"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "krypter data (symmetrisk)"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "dekrypter data (forvalgt)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "bekreft signatur"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "vis nøkler"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "vis nøkler og signaturer"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "vis og kontroller nøkkelsignaturer"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "vis nøkler og fingeravtrykk"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "vis hemmelige nøkler"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "lag nytt nøkkelpar"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "lag nytt nøkkelpar raskt"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr "legg til en ny bruker-ID raskt"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr "opphev bruker-ID raskt"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr "endre utløpsdato raskt"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "fullverdig generering av nøkkelpar"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "lag opphevelsessertifikat"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "fjern nøkler fra offentlig nøkkelknippe"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøkler fra hemmelig nøkkelknippe"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "hurtigsigner nøkkel"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "hurtigsigner nøkkel lokalt"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "opphev bruker-ID raskt"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "signer nøkkel"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "signer nøkkel lokalt"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "signer eller rediger nøkkel"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "endre passordfrase"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "eksporter nøkler"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "eksporter nøkler til nøkkeltjener"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importer nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "søk etter nøkler på nøkkeltjener"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "oppdater alle nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importer/slå sammen nøkler"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "vis kortstatus"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "endre data på kort"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "endre PIN på kort"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "oppdater tillitsdatabase"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "skriv ut kontrollsum av melding"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "kjør i tjenermodus"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VERDI|endre TOFU-regler for nøkkel"
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAVN|bruk valgt NAVN som forvalgt hemmelig nøkkel"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAVN|krypter også til valgt bruker-id-NAVN"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPES|sett opp e-post-alias"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "bruk streng OpenPGP-oppførsel"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "ikke utfør valgte endringer"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "spør før overskriving"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the input"
+msgstr "Sikkerhetsvalg"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+#, fuzzy
+#| msgid "Options controlling the diagnostic output"
+msgid "Options controlling the output"
+msgstr "Styring av diagnostikk-utdata"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "lag ASCII-beskyttet utdata"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|skriv utdata til valgt FIL"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|BRUKER-ID|bruk valgt BRUKER-ID til å signere eller dekryptere"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "bruk kanonisk tekstmodus"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+#, fuzzy
+#| msgid "Options controlling the interactivity and enforcement"
+msgid "Options controlling key import and export"
+msgstr "Valg som styrer grensesnitt og håndheving av regler"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|FILE|skriv utdata til valgt FIL"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MEKANISMER|bruk valgte MEKANISME til å finne nøkler med e-postadresse"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "ikke utfør valgte endringer"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "slå av all tilgang til dirmngr"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "spør før overskriving"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+#, fuzzy
+#| msgid "Options controlling the configuration"
+msgid "Options controlling key listings"
+msgstr "Oppsettsvalg"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "bruk streng OpenPGP-oppførsel"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "vis hemmelige nøkler"
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|BRUKER-ID|bruk valgt BRUKER-ID til å signere eller dekryptere"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2755,7 +2921,7 @@ msgstr ""
 "@\n"
 "(Se bruksanvisning for en fullstendig liste over alle kommandoer og valg)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2775,11 +2941,11 @@ msgstr ""
 " --list-keys [navn]         vis nøkler\n"
 " --fingerprint [navn]       vis fingeravtrykk\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Bruk: @GPG@ [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2789,7 +2955,7 @@ msgstr ""
 "Signer, kontroller, krypter eller dekrypter.\n"
 "Forvalgt handling avhenger av inndata.\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2797,541 +2963,541 @@ msgstr ""
 "\n"
 "Støttede algoritmer:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Off. nøkkel: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Kryptering: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "bruk: %s [valg] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "fant ingen «=»-tegn i gruppedefinisjon «%s»\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til utvidelse «%s»\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til utvidelse «%s»\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, 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:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, 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:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "oppsettselementet «%s» er ukjent\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "vis foto-id-er i nøkkelvisning"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "vis regeladresser i signaturvisning"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "vis alle notater i signaturvisning"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotater under signaturvisning"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brukervalgte notater under signaturvisning"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 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:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "vis nøkkelknippe-navn i nøkkelvisning"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "vis utløpsdatoer i nøkkelvisning"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "«%s» er et ukjent TOFU-regelverk\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(bruk «help» for å vise valg)\n"
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
 
-#: g10/gpg.c:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "«%s» er en ugyldig signatur-utløpstid\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "«%s» er en ugyldig e-postadresse\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, 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:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "«%s» er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ugyldige nøkkeltjener-valg\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importeringsvalg\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "ugyldige importeringsvalg\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "filtervalget %s er ugyldig\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksporteringsvalg\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "ugyldige eksporteringsvalg\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "vis bruker-ID under signaturbekreftelse"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "vis adresser til retningslinjer under signaturbekreftelse"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "vis alle merknader under signaturbekreftelse"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotater under signaturbekreftelse"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "vis selvvalgte merknader under signaturbekreftelse"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "kontroller signaturer som har PKA-data"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "øk tillitsnivå for signaturer med gyldige PKA-data"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige kontrollvalg\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ugyldige kontrollvalg\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "klarte ikke å endre «exec»-sti til %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig «auto-key-locate»-liste\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "du kan ikke bruke %s med %s.\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s gir ikke mening med %s.\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "ADVARSEL: kjører med falsk systemtid: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, 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:3839
+#: g10/gpg.c:3837
 #, 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:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig «min-cert-level» (må være 0, 1, 2 eller 3)\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Merk: enkel S2K-modus (0) er sterkt frarådet\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-modus (må være 0, 1 eller 3)\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ugyldig standardoppsett\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enda med %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøkkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "søk på nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "«%s» er en ugyldig summeringsalgoritme\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "feil under tolking av nøkkelspesifikasjon «%s»: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, 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:5134
+#: g10/gpg.c:5132
 #, 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:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv inn melding …\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "valgt adresse for signaturregler er ugyldig\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
@@ -3344,7 +3510,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
@@ -4052,7 +4218,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker på at du vil signerere den? (j/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Klarte ikke å signere.\n"
 
@@ -4225,8 +4391,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:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
@@ -4426,7 +4592,7 @@ msgstr ""
 "  (nrsign), eller hvilken som helst kombinasjon av disse (ltsign, tnrsign, "
 "osv.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Nøkkelen er opphevet."
 
@@ -4474,7 +4640,7 @@ msgstr "Er du sikker på at du vil fjerne valgt bruker-ID? (j/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Er du sikker på at du vil flytte primærnøkkelen? (j/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "Du må velge minst én nøkkel.\n"
 
@@ -4550,162 +4716,162 @@ msgstr "Vil du lagre endringer? (j/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Vil du avslutte uten å lagre? (j/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Nøkkelen ble ikke endret, så ingen oppdatering er nødvendig.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "klarte ikke å oppheve siste gyldige bruker-ID.\n"
 
-#: g10/keyedit.c:2476
+#: g10/keyedit.c:2532
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "opphevelse av bruker-id mislyktes: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "endring av primær bruker-ID mislyktes: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "«%s» er ikke et fingeravtrykk\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "«%s» er ikke primært fingeravtrykk\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Bruker-ID «%s» er ugyldig: %s\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "Ingen treff på bruker-id-er."
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "Ingenting å signere.\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Ikke signert av deg.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "kontroll av opprettet signatur mislyktes: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "«%s» er en ugyldig utløpstid\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "«%s» er et ugyldig fingeravtrykk\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "fant ikke undernøkkel «%s»\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Kontrollsum: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Funksjoner: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Nøkkeltjener no-modify"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Foretrukket nøkkeltjener: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-brukere har ingen oppsettsmuligheter.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Følgende nøkkel ble opphevet %s av %s med nøkkelen %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne nøkkelen kan bli opphevet av %s med nøkkelen %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "utgår: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "bruk: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "kortnr.: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Denne nøkkelen er ikke i bruk"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4713,17 +4879,17 @@ msgstr ""
 "Merk: du bør starte programmet på nytt for å sikre at nøkkel-gyldigheten\n"
 "som vises her er riktig.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "utgått"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4732,17 +4898,17 @@ msgstr ""
 "ADVARSEL: ingen bruker-ID er merket som primær. Denne kommandoen kan\n"
 "              føre til at en annen bruker-ID blir brukt som primærbruker.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "ADVARSEL: Undernøkkel for kryptering utløper snart.\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Du bør vurdere å endre utløpsdato samtidig.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4752,72 +4918,72 @@ msgstr ""
 "føre til at\n"
 "         enkelte PGP-versjoner avviser nøkkelen.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker på at du vil legge den til? (j/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vil du slette denne ugyldige signaturen? (j/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vil du slette denne ukjente signaturen? (j/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Er du sikker på at du vil slette denne selvsignaturen? (j/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Slettet %d signatur.\n"
 msgstr[1] "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Bruker-ID «%s» pakket sammen: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Bruker-ID «%s»: %d signatur fjernet\n"
 msgstr[1] "Bruker-ID «%s»: %d signaturer fjernet\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Bruker-ID «%s»: allerede minimert\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Bruker-ID «%s»: allerede renset\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4827,216 +4993,216 @@ msgstr ""
 "         kan dette føre til at enkelte PGP-versjoner ikke vil kunne bruke "
 "nøkkelen.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du kan ikke knytte opphevere til PGP 2.x-nøkler.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Skriv inn oppheverens bruker-ID: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "du kan ikke bruke PGP 2.x-nøkler som opphevere\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan ikke bruke en nøkkel som opphevelsesnøkkel for seg selv\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "denne nøkkelen er allerede i bruk som opphevelsesnøkkel\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ADVARSEL: du kan ikke angre tildeling av opphevelsesrolle til en nøkkel.\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Er du sikker på at du vil gjøre denne nøkkelen til en opphever? (j/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 "Er du sikker på at du vil endre utløpstid for flere undernøkler? (j/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Endrer utløpstid for undernøkkel.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Endrer utløpstid for primærnøkkel.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan ikke endre utløpsdato for v3-nøkler\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Endrer utløpstid for undernøkkel.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Endrer utløpstid for primærnøkkel.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signerings-undernøkkel %s er allerede kryssertifisert\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "undernøkkel %s signerer ikke, og behøver derfor ikke å bli kryssertifisert\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Velg én bruker-ID.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3-selvsignatur for bruker-ID «%s»\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Skriv inn adresse til foretrukket nøkkeltjener: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 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:5344
+#: g10/keyedit.c:5400
 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:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Skriv inn notat: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Vil du fortsette? (j/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruker-ID med indeks %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruker-ID med kontrollsum %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Ingen undernøkkel med ID «%s».\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøkkel med indeks %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruker-ID: «%s»\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vil du lage et opphevelsessertifikat for denne signaturen? (j/N) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (kan ikke oppheves)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "opphevet med nøkkelen %s %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du er i ferd med å oppheve følgende signaturer:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Er du sikker på at du vil lage opphevelsessertifikatene? (j/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemmelig nøkkel\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, 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:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "bruker-ID «%s» er allerede opphevet\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Klarte ikke å oppheve siste gyldige bruker-ID.\n"
 
-#: g10/keyedit.c:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nøkkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernøkkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5500,7 +5666,7 @@ msgstr ""
 "tallgeneratoren bedre muligheter til å samle inn vilkårlighetsdata.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nøkkelgenerering mislyktes: %s\n"
@@ -5570,11 +5736,11 @@ msgstr "fant ikke skrivbart offentlig nøkkelknippe: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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"
@@ -5583,7 +5749,7 @@ msgstr ""
 "vurdere å bruke kommandoen «--edit-key» for å lage en\n"
 "undernøkkel til dette formålet.\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5591,7 +5757,7 @@ msgstr ""
 "nøkkel har blitt opprettet %lu sekund i framtiden (time warp- eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5599,23 +5765,23 @@ msgstr ""
 "nøkkel har blitt opprettet %lu sekunder i framtiden (time warp- eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Er du sikker på at du vil fortsette? (j/N) "
 
@@ -5823,263 +5989,263 @@ msgstr "ber om nøkkel fra «%s»\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: klarte ikke å fange URI %s: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "merkelig størrelse for en kryptert sesjonsnøkkel (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kryptert øktnøkkel\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passordfrase generert med ukjent summeringsalgoritme %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig nøkkel er %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "offentlig nøkkel-kryptert data: god DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kryptert med %u-bit %s-nøkkel, ID %s, opprettet %s\n"
 
 # Do we really need to translate this string.
 # The must some bug in the code.
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      «%s»\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kryptert med %s-nøkkel, ID %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "offentlig nøkkel-dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "ADVARSEL: fant flere elementer i ren tekst\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kryptert med %lu passordfraser\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "kryptert med 1 passordfrase\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar %s kryptert data\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: meldinga var ikke integritetsbeskyttet\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "dekryptering ok\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ADVARSEL: kryptert melding er blitt manipulert.\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Merk: senderen spesifiserte «kun for dine øyne»\n"
 
-#: g10/mainproc.c:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "opprinnelig filnavn=«%.*s»\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "fant ikke signatur\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "DÅRLIG signatur fra «%s»"
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgått signatur fra «%s»"
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra «%s»"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signaturbekreftelse ble hindret\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "disse flertydige signaturdataene kan ikke behandles\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur opprettet %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruker %s nøkkel %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                utsteder «%s»\n"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Nøkkel tilgjengelig ved: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka «%s»"
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utgått %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utgår %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s-signatur, kontrollsum-algoritme %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binær"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ", nøkkelalgoritme"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, 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:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Klarte ikke å kontrollere signatur: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ikke en separat signatur\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "separat signatur av klasse 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
@@ -6145,68 +6311,68 @@ msgstr "(rapportert feil: %s <%s>)\n"
 msgid "(further info: "
 msgstr "(mer info: "
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: valget «%s» er utgått\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: valget «%s» er utgått\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "bruk heller «%s%s»\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ADVARSEL: «%s» er en utgått kommando. Ikke bruk den\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: «%s» er utgått i denne fila, og påvirker bare %s\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "ADVARSEL: valget «%s%s» er utgått, og påvirker bare %s\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Ukomprimert"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "ukomprimert|ingen"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "denne meldinga kan kanskje ikke brukes av %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "«%s» er et flertydig valg\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "«%s» er et ukjent valg\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "Offentlig ECDSA-nøkler forventes i SEC-koding som kan ganges med 8 bit\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "«%s» er en ukjent svak summeringsmetode\n"
@@ -6239,23 +6405,23 @@ msgstr "skriver til stdout\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "antar signert data i «%s»\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "klarte ikke å håndtere offentlig nøkkelalgoritme %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "ADVARSEL: det er usikkert å kryptere øktnøkkel symmetrisk\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kritisk signaturnotat: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpakke %d er merket som kritisk\n"
@@ -6672,12 +6838,12 @@ msgstr "«%s» er en ukjent standardmottaker\n"
 msgid "no valid addressees\n"
 msgstr "ingen gyldige mottakere\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Merk: nøkkel %s har ingen %s-funksjon\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Merk: nøkkel %s har ingen innstilling for %s\n"
@@ -7110,7 +7276,7 @@ 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."
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitsoppføring %lu, type %d: skriving mislyktes: %s\n"
@@ -7155,7 +7321,7 @@ msgstr "feil under søk etter tillitspost i «%s»: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "lesefeil i «%s»: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synk mislyktes: %s\n"
@@ -7668,147 +7834,147 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "«%s» er en ugyldig lang nøkkel-ID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "nøkkel %s: godtatt som betrodd nøkkel\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "nøkkel %s forekommer flere enn én gang i trustdb\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "nøkkel %s: ingen offentlig nøkkel for betrodd nøkkel - hoppet over\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "nøkkel %s markert som endelig betrodd.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitsoppføring %lu, foresp.type %d: lesing mislyktes: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "tillitsoppføring %lu er ikke av forespurt type (%d)\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 "Du kan prøve å gjenskape trustdb ved å skrive inn følgende kommandoer:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Se bruksanvisning hvis dette ikke hjelper\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "Klarte ikke å bruke ukjent tillitsmodell (%d). Prøver tillitsmodell %s\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "bruker tillitsmodell %s\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "kontroll av trustdb er ikke nødvendig\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "neste kontroll av trustdb planlagt %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "trustdb behøver ikke kontroll ved bruk av tillitsmodell «%s»\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "trustdb behøver ikke oppdatering ved bruk av tillitsmodell «%s»\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "fant ikke offentlig nøkkel %s: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "kjør «--check-trustdb»\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontrollerer trustdb\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, 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:2007
+#: g10/trustdb.c:2050
 #, 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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "fant ingen nøkler med absolutt («ultimat») pålitelighet\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, 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:2290
+#: g10/trustdb.c:2333
 #, 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"
 
@@ -7820,39 +7986,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.]"
 
@@ -7900,33 +8066,33 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNummer\\x1f: %s%%0AHolder\\x1f: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Gjenstående forsøk: %d"
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Skriv inn admin-PIN"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Skriv inn PIN-kode for standardnøkler."
 
@@ -7992,7 +8158,7 @@ msgstr "klarte ikke å lagre fingeravtrykk: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke å lagre opprettelsesdato: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "feil under henting av CHV-status fra kort\n"
@@ -8057,7 +8223,7 @@ msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kortet er låst for godt.\n"
@@ -8198,13 +8364,13 @@ msgstr "kortet støtter ikke kontrollsum-algoritme %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet så langt: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, 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:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "fikk ikke tilgang til %s. Bruker du et ugyldig OpenPGP-kort?\n"
@@ -8220,55 +8386,55 @@ msgstr "||Skriv inn PIN-koden på leserens kodetastatur"
 msgid "|N|Initial New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "kjør i multi-tjenermodus (forgrunn)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|FIL|skriv logg til valgt FIL"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|koble til leser via port N"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAVN|bruk valgt NAVN som ct-API-driver"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|bruk valgt NAVN som PC-/SC-driver"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "ikke bruk intern CCID-driver"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|koble fra kort etter N antall sekunder uten aktivitet"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "ikke bruk kodetastatur"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "avvis bruk av admin-kortkommandoer"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "bruk inndata av vairabel lengde for kodetastatur"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "avvis bruk av admin-kortkommandoer"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Bruk: @SCDAEMON@ [valg] (-h for hjelp)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8276,21 +8442,27 @@ msgstr ""
 "Syntaks: scdaemon [valg] [kommando [arg]]\n"
 "Smartcard-bakgrunnsprogram for @GNUPG@\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "bruk valget «--daemon» for å kjøre programmet i bakgrunnen\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "startet håndteringsprogram for fd %d\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "avsluttet håndteringsprogram for fd %d\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "feil under henting av informasjon om nøkkelbruk: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8348,7 +8520,7 @@ msgstr "slår opp utsteder på ekstern plassering\n"
 msgid "number of issuers matching: %d\n"
 msgstr "antall ustedere funnet: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "klarte ikke å hente «authorityInfoAccess»: %s\n"
@@ -8508,7 +8680,7 @@ msgstr "rotsertifikat er ikke merket som troverdig"
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll av tillitsliste mislyktes: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "sertifikatkjede er for langt\n"
@@ -8562,7 +8734,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "kontrollsum på %u bit er ugyldig for en %u-bit %s-nøkkel\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8573,7 +8745,7 @@ msgstr "kjernen er full\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(dette er algortime MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "ingen"
 
@@ -8608,42 +8780,37 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "opprettet %s, utgår %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen bruksområder for nøkler valgt. Antar alle bruksområder\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "feil under henting av informasjon om nøkkelbruk: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "sertifikatet skulle ikke vært brukt til sertifisering\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "sertifikatet skulle ikke vært brukt til OCSP-responssignering\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "sertifikatet skulle ikke vært brukt til kryptering\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "sertifikatet skulle ikke vært brukt til signering\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "sertifikatet egner seg ikke til kryptering\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "sertifikatet egner seg ikke til signering\n"
@@ -8832,6 +8999,11 @@ msgstr "Vil du lage selvsignert sertifikat? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "Følgende parametre brukes:\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "feil under oppretting av midlertidig fil: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "Lager selvsignert sertifikat."
@@ -8911,123 +9083,123 @@ msgstr "sletting av sertifikat «%s» mislyktes: %s\n"
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige mottakere valgt\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "vis eksterne nøkler"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "vis sertifikatkjede "
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "importer sertifikater"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "eksporter sertifikater"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "registrer smartkort"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "send en kommando til dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "kall gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "lag base64-kodet utdata"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "ikke bruk terminal i det hele tatt"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|antall sertifikater som skal være med"
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|FIL|hent regler fra valgt FIL"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "forvent inndata i «PEM»-format"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "forvent inndata i «base-64»-format"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "forvent inndata i binærformat"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "lag base64-kodet utdata"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|BRUKER-ID|bruk valgt BRUKER-ID som forvalgt hemmelig nøkkel"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FIL|legg til nøkkelknippe i liste over nøkkelknipper"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "hent manglende utstedersertifikat"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAVN|bruk valgt kodeNAVN til PKCS#12-passordfraser"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "aldri spør CRL"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "ikke se etter rotsertifikater i CRL"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "kontroller gyldighet med OCSP"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|antall sertifikater som skal være med"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|FIL|hent regler fra valgt FIL"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "ikke kontroller sertifikatregler"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "hent manglende utstedersertifikat"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "ikke bruk terminal i det hele tatt"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|FIL|lagre en tjenermodus-logg i valgt FIL"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAVN|bruk valgt krypteringsalgoritme-NAVN"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FIL|lagre en revisjonslogg i valgt FIL"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAVN|bruk valgt summeringsalgoritme-NAVN for melding"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "buntmodus: aldri spør"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "svar automatisk ja på de fleste spørsmål"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "svar automatisk nei på de fleste spørsmål"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FIL|legg til nøkkelknippe i liste over nøkkelknipper"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|BRUKER-ID|bruk valgt BRUKER-ID som forvalgt hemmelig nøkkel"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|bruk valgt nøkkeltjener til å slå opp nøkler"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAVN|bruk valgt krypteringsalgoritme-NAVN"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAVN|bruk valgt summeringsalgoritme-NAVN for melding"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FIL|lagre en revisjonslogg i valgt FIL"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Bruk: @GPGSM@ [valg] [filer] (-h for hjelp)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9037,27 +9209,27 @@ msgstr ""
 "Signer, kontroller, krypter eller dekrypter.\n"
 "Forvalgt handling avhenger av inndata.\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "«%s» er en ukjent kontrollmodell\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importerer sertifikat «%s»\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "klarte ikke å signere med «%s»: %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ugyldig kommando (implisitt kommando finnes ikke)\n"
@@ -9117,7 +9289,7 @@ msgstr "det oppstod en feil under nytt søk etter sertifikat: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "feil under lagring av valg: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Feil - "
 
@@ -9153,7 +9325,7 @@ msgstr ""
 "\n"
 "%s%sEr du sikker på at du vil gjøre dette?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9205,7 +9377,7 @@ msgstr "[dato ikke oppgitt]"
 msgid "algorithm:"
 msgstr "algoritme: %s"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9213,17 +9385,17 @@ msgstr ""
 "ugyldig signatur. Kontrollsum-attributt for melding samsvarer ikke med "
 "attributt for utregnet sum\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Gyldig signatur fra"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "                også kjent som"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Dette er en godkjent signatur\n"
@@ -10001,113 +10173,136 @@ msgstr "forventet fullstendig filsti\n"
 msgid "looking up '%s'\n"
 msgstr "slår opp «%s»\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "vis innhold i CRL-hurtiglager"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FIL|last inn CRL fra valgt FIL i hurtiglager"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|ADR|hent CRL fra valgt nettADResse"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "slå av dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "tøm hurtiglager"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr "tillat kontroll av programvare-versjon over nett"
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "kjør uten å spørre bruker"
+#: dirmngr/dirmngr.c:218
+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:196
-msgid "force loading of outdated CRLs"
-msgstr "tving innlasting av utdatert CRL"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "tillat sending av OCSP-forespørsler"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
+msgstr "kjør all nettverkstrafikk gjennom Tor"
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
-msgstr "tillat kontroll av programvare-versjon over nett"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "Oppsett for nøkkeltjenere"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|ADR|bruk nøkkeltjener på valgt nettADResse"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:244
+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:247
+msgid "Configuration for HTTP servers"
+msgstr "Oppsett for HTTP-tjenere"
+
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "hindre bruk av HTTP"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "hindre bruk av LDAP"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorer HTTP CRL-distribusjonspunkter"
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
-msgstr "ignorer LDAP CRL-distribusjonspunkter"
-
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
-
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|ADR|videresend alle HTTP-forespørsler til valgt nettADResse"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "bruk systemets innstilling for HTTP-mellomtjener"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "Oppsett for bruk av LDAP-tjenere"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "hindre bruk av LDAP"
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignorer LDAP CRL-distribusjonspunkter"
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|VERT|bruk valgt VERT til LDAP-oppslag"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "ikke bruk tilbakefallsverter ved bruk av valget «--ldap-proxy»"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|bruk valgt nøkkeltjener til å slå opp nøkler"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FIL|les LDAP-tjenerliste fra valgt FIL"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 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:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|endre LDAP-tidsavbrudd til N antall sekunder"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "Oppsett for OCSP"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "tillat sending av OCSP-forespørsler"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|ADR|bruk OCSP-svartjeneste ved valgt nettADResse"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP-svartjeneste signert av FPR"
 
-#: dirmngr/dirmngr.c:235
-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:240
-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
-msgid "route all network traffic via Tor"
-msgstr "kjør all nettverkstrafikk gjennom Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "tving innlasting av utdatert CRL"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10116,11 +10311,11 @@ msgstr ""
 "@\n"
 "Se «info»-bruksanvisning for fullstendig liste over alle kommandoer og valg\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Bruk: @DIRMNGR@ [valg] (-h for hjelp)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10128,83 +10323,83 @@ msgstr ""
 "Syntaks: @DIRMNGR@ [valg] [kommando [arg]]\n"
 "Tilgang til nøkkeltjener, CRL og OCSP for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "bruk: %s [valg] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "kolon tillates ikke i sokkelnavn\n"
 
-#: dirmngr/dirmngr.c:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "henting av CRL fra «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: for lang linje. Hoppet over\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: lesefeil: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: ignorerer ugyldige data ved linjeslutt\n"
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, 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:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM mottatt. Slår av …\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "slår av under tvang\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT mottatt. Slår av umiddelbart\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d mottatt. Ingen handling definert\n"
@@ -10395,91 +10590,91 @@ msgstr "summering av OCSP-svar for «%s» mislyktes: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "ikke signert av sertifikat som tilhører en forvalgt OCSP-fullmektig"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 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:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, 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:643
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "klient sendte ikke utstedersertifikat\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "ingen forvalgt OCSP-svartjeneste\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "bruker forvalgt OCSP-svartjeneste «%s»\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "bruker OCSP-svartjeneste «%s»\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, 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:792
 #, 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:793
 msgid "good"
 msgstr "bra"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, 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:846
 #, 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:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP-svartjeneste sendte for gammel status\n"
@@ -10489,67 +10684,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:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "serienummer mangler i sertifikat-ID"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "«assuan_inquire» mislyktes: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "«fetch_cert_by_url» mislyktes: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "feil under sending av data: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "«start_cert_fetch» mislyktes: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "«fetch_next_cert» mislyktes: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d overskredet\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "klarte ikke å starte opp tjener: %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
 
-#: dirmngr/server.c:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan-godkjenningsproblem: %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan-behandling mislyktes: %s\n"
@@ -10592,7 +10787,7 @@ msgstr "sertifikatkjede er funnet i orden\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "sertifikat skulle ikke vært brukt til CRL-signering\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "stille"
 
@@ -10685,282 +10880,134 @@ msgstr "sending av linje mislyktes: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "feil under sending av standardvalg: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Styring av diagnostikk-utdata"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Oppsettsvalg"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Nyttige feilsøkingsvalg"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Sikkerhetsvalg"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|SSH-nøkler utgår etter N antall sekunder"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-"|N|endre maksimal livstid for PIN-koder i hurtiglager til N antall sekunder"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|endre maksimal livstid for SSH-nøkler til N antall sekunder"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Valg som håndhever passordfrase-regler"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "ikke tillat avvik fra passordregler"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|endre minimal passordfrase-lengde til N"
-
-#: tools/gpgconf-comp.c:580
-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"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|FIL|kontroller nye passordfraser mot mønster i valgt FIL"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|regn passord som ugyldig etter N antall dager"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "ikke tillat gjenbruk av gamle passordfraser"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|endre tidsavbrudd for PIN-inntasting til N antall sekunder"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAVN|bruk valgt NAVN som forvalgt hemmelig nøkkel"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAVN|krypter også til valgt bruker-id-NAVN"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPES|sett opp e-post-alias"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "Oppsett for nøkkeltjenere"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|ADR|bruk nøkkeltjener på valgt nettADResse"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "tillat PKA-oppslag (DNS-forespørsler)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MEKANISMER|bruk valgte MEKANISME til å finne nøkler med e-postadresse"
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "importer nøkler fra nøkkeltjener"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-#| msgid "list and check key signatures"
-msgid "include the public key in signatures"
-msgstr "vis og kontroller nøkkelsignaturer"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "slå av all tilgang til dirmngr"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAVN|bruk valgt kodeNAVN til PKCS#12-passordfraser"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "ikke se etter rotsertifikater i CRL"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Valg som styrer utdata-format"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Valg som styrer grensesnitt og håndheving av regler"
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr "Valg som styrer bruk av Tor"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "Oppsett for HTTP-tjenere"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "bruk systemets innstilling for HTTP-mellomtjener"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "Oppsett for bruk av LDAP-tjenere"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "LDAP-tjenerliste"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "Oppsett for OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr "Privatnøkler"
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr "Smartkort"
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr "Nettverk"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr "Skriving av passordfrase"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "Komponent egner seg ikke for oppstart"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, 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:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Ekstern bekreftelse av komponent %s mislyktes"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "feil under lukking av «%s»\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "feil under tolkning av «%s»\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "vis alle komponenter"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "kontroller alle programmer"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENT|vis valg"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENT|endre valg"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENT|kontroller valg"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "bruk globale standardverdier"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FIL|oppdater oppsettsfiler ved bruk av valgt FIL"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "hent oppsettsmapper for @GPGCONF@"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "vis global oppsettsfil"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "kontroller global oppsettsfil"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr "søk i versjonsdatabase"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "last inn én eller alle komponenter på nytt"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "last inn valgt komponent"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "drep valgt komponent"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "bruk som utdatafil"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "ta i bruk endringer under kjøring, hvis mulig"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Bruk: @GPGCONF@ [valg] (-h for hjelp)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10968,15 +11015,15 @@ msgstr ""
 "Syntaks: @GPGCONF@ [valg]\n"
 "Behandle oppsettsvalg for verktøy i @GNUPG@-systemet\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Komponent-argument mangler"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Fant ikke komponent"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "Ingen argumenter tillatt"
 
@@ -10992,6 +11039,40 @@ msgstr ""
 "Syntaks: gpg-check-pattern [valg] mønsterfil\n"
 "Kontroller passordfrase oppgitt på standard innkanal mot valgt mønsterfil\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "feil under skriving til midlertidig fil: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "bruk loggfil for tjeneren"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|FIL|lagre en tjenermodus-logg i valgt FIL"
+
+#~ msgid "run without asking a user"
+#~ msgstr "kjør uten å spørre bruker"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "tillat PKA-oppslag (DNS-forespørsler)"
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "importer nøkler fra nøkkeltjener"
+
+#, fuzzy
+#~| msgid "list and check key signatures"
+#~ msgid "include the public key in signatures"
+#~ msgstr "vis og kontroller nøkkelsignaturer"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "Valg som styrer utdata-format"
+
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Valg som styrer bruk av Tor"
+
+#~ msgid "LDAP server list"
+#~ msgstr "LDAP-tjenerliste"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "ber om nøkkelen %s fra %s tjener %s\n"
 
@@ -11163,9 +11244,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "klarte ikke å åpne %s for skriving: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "feil under skriving til %s: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "feil under lesing fra %s: %s\n"
 
@@ -11324,9 +11402,6 @@ msgstr ""
 #~ msgid "listen() failed: %s\n"
 #~ msgstr "listen() mislyktes: %s\n"
 
-#~ msgid "do not grab keyboard and mouse"
-#~ msgstr "ikke bruk tastatur og mus"
-
 #~ msgid "Error: URL too long (limit is %d characters).\n"
 #~ msgstr "Feil: Adressen er for lang (grensa er %d tegn).\n"
 
diff --git a/po/pl.gmo b/po/pl.gmo
index 3dffac4..00f77e6 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 67507aa..fb6115c 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -140,8 +140,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Hasło:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "nie pasują - proszę spróbować jeszcze raz"
 
@@ -186,62 +186,92 @@ msgstr "Niepoprawny PIN"
 msgid "Bad Passphrase"
 msgstr "Niepoprawne hasło"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "błąd pobierania numeru seryjnego karty: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Proszę ponownie wprowadzić to hasło"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase to protect the imported object within the "
+#| "GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Proszę wprowadzić hasło do zabezpieczenia ważnego obiektu w systemie GnuPG."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "klucze ssh większe niż %d bitów nie są obsługiwane\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "nie można utworzyć ,,%s'': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "nie można otworzyć ,,%s'': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "błąd pobierania numeru seryjnego karty: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "wykryto kartÄ™ o numerze seryjnym: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "nie znaleziono klucza uwierzytelniajÄ…cego dla ssh na karcie: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nie znaleziono pasujÄ…cego klucza karty: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "błąd pobierania listy kart: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -249,24 +279,20 @@ msgid ""
 msgstr ""
 "Proces ssh zarządał użycia klucza%%0a  %s%%0A  (%s)%%0ACzy zezwolić na to?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "Zgoda"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "Odmowa"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Proszę wprowadzić hasło dla klucza ssh%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Proszę ponownie wprowadzić to hasło"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -275,95 +301,91 @@ msgstr ""
 "Proszę wprowadzić hasło do zabezpieczenia odebranego klucza tajnego%%0A   %s"
 "%%0A   %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "Proszę włożyć kartę z numerem seryjnym"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "Proszę wyjąć obecną kartę i włożyć kartę z numerem seryjnym"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "PIN administracyjny"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Kod resetujÄ…cy"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr "Wciśnij przycisk ACK na karcie/tokenie."
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr "Do wpisywania należy użyć klawiatury czytnika."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Powtórz ten kod resetujący"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "Powtórz ten PUK"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Powtórz ten PIN"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Kod resetujący nie powtórzony poprawnie; spróbuj jeszcze raz"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK nie powtórzony poprawnie; spróbuj jeszcze raz"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nie powtórzony poprawnie; spróbuj jeszcze raz"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Proszę wprowadzić PIN%s%s%s aby odblokować kartę"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "błąd tworzenia pliku tymczasowego: %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "błąd zapisu do pliku tymczasowego: %s\n"
+#: agent/genkey.c:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "błąd zapisu do %s: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Wprowadź nowe hasło"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "Przyjmij je mimo to"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, 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:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -372,11 +394,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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Tak, ochrona nie jest potrzebna"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -384,7 +406,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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -395,157 +417,228 @@ msgstr[1] ""
 msgstr[2] ""
 "Hasło powinno zawierać przynajmniej %u cyfr lub%%0Aznaków specjalnych."
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, 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:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Ostrzeżenie: Wprowadzono hasło, które nie jest bezpieczne."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Proszę wprowadzić nowe hasło"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Opcje:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+#, fuzzy
+#| msgid "Options useful for debugging"
+msgid "Options used for startup"
+msgstr "Opcje przydatne do diagnostyki"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "uruchomienie w trybie demona (w tle)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr "uruchomienie w trybie dozorowanym"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "więcej komunikatów"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "mniej komunikatów"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "bez odłączania od konsoli"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "wyjście poleceń w stylu sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "wyjście poleceń w stylu csh"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "bez odłączania od konsoli"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Opcje sterujące wyjściem diagnostycznym"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "użycie pliku loga dla serwera"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "więcej komunikatów"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|użycie PGM jako programu do wprowadzania PIN-u"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "mniej komunikatów"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|użycie PGM jako programu SCdaemon"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|PLIK|zapis logów trybu serwera do PLIKU"
+
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Opcje sterujÄ…ce konfiguracjÄ…"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "nieużywanie SCdaemona"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|użycie PGM jako programu SCdaemon"
+
+#: agent/gpg-agent.c:213
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAZWA|przyjęcie poleceń poprzez NAZWĘ"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorowanie żądań zmiany TTY"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorowanie żądań zmiany ekranu X"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "włączenie obsługi ssh"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|ALGO|użycie ALGO do wyświetlania odcisków ssh"
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "włączenie obsługi putty"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Opcje sterujące bezpieczeństwem"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|przedawnienie pamiętanych PIN-ów po N sekundach"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|przedawnienie kluczy SSH po N sekundach"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr ""
+"|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|ustawienie maksymalnego czasu życia kluczy SSH na N sekund"
+
+#: agent/gpg-agent.c:248
 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:250
 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:252
 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:257
 msgid "allow presetting passphrase"
 msgstr "zezwolenie na predefiniowane hasło"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Opcje wymuszające politykę haseł"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "niezezwalanie na pominięcie polityki haseł"
+
+#: agent/gpg-agent.c:267
+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:269
+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:272
+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:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|przedawnianie haseł po N dniach"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "niezezwalanie na ponowne użycie starych haseł"
+
+#: agent/gpg-agent.c:281
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the PIN-Entry"
+msgstr "Opcje sterujące bezpieczeństwem"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
+msgstr ""
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr "niezezwalanie wywołującym na nadpisywanie pinentry"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
-msgstr "zezwolenie na pytanie o hasło poprzez Emacsa"
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
 
-#: agent/gpg-agent.c:258
-msgid "enable ssh support"
-msgstr "włączenie obsługi ssh"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|użycie PGM jako programu do wprowadzania PIN-u"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "|ALGO|użycie ALGO do wyświetlania odcisków ssh"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|ustawienie limitu czasu Pinentry na N sekund"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "włączenie obsługi putty"
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Składnia: @GPG_AGENT@ [opcje] (-h wyświetla pomoc)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -553,135 +646,143 @@ msgstr ""
 "Składnia: @GPG_AGENT@ [opcje] [polecenie [argumenty]]\n"
 "ZarzÄ…dzanie kluczem tajnym dla @GNUPG@\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "podano błędny poziom diagnostyki ,,%s''\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Uwaga: ,,%s'' nie jest uznane za opcjÄ™\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie można utworzyć gniazda: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "nazwa gniazda ,,%s'' zbyt długa\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "błąd podczas pobierania nonce z gniazda\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "błąd podczas przypisywania gniazda do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "nasłuchiwanie na gnieździe ,,%s''\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "nie można utworzyć katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "katalog ,,%s'' utworzony\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() nie powiodło się dla ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, 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:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, 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:2739
+#: agent/gpg-agent.c:2721
 #, 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:2744
+#: agent/gpg-agent.c:2726
 #, 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:2819
+#: agent/gpg-agent.c:2801
 #, 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:2824
+#: agent/gpg-agent.c:2806
 #, 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:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, 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:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s zatrzymany\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "brak działającego gpg-agenta w tej sesji\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Opcje:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
@@ -695,8 +796,8 @@ msgstr ""
 "Składnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
 "Utrzymuwanie pamięci haseł\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -704,9 +805,8 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -761,43 +861,43 @@ msgstr "anulowano\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "błąd podczas pytania o hasło: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "błąd podczas otwierania ,,%s'': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "plik ,,%s'', linia %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "instrukcja \"%s\" zignorowana w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "systemowa lista zaufania ,,%s'' niedostępna\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "błędny odcisk w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "nieprawidłowa flaga klucza w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "błąd odczytu ,,%s'', w linii %d: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "błąd odczytu listy zaufanych certyfikatów głównych\n"
@@ -810,7 +910,7 @@ msgstr "błąd odczytu listy zaufanych certyfikatów głównych\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -819,11 +919,11 @@ msgstr ""
 "Czy absolutnie ufasz, że%%0A  ,,%s''%%0Apoprawnie poświadcza certyfikaty "
 "użytkowników?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Tak"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "Nie"
@@ -836,7 +936,7 @@ msgstr "Nie"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -848,20 +948,20 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "Akceptuj"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "Odrzuć"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Uwaga: To hasło nie było nigdy zmieniane.%0AProszę zmienić je teraz."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -869,15 +969,15 @@ msgid ""
 msgstr ""
 "To hasło nie zostało zmienione%%0Aod %.4s-%.2s-%.2s. Proszę zmienić je teraz."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Zmiana hasła"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "Zmienię je później"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -885,11 +985,11 @@ msgid ""
 msgstr ""
 "Czy na pewno usunąć klucz identyfikowany przez uchwyt%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "Usuń klucz"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -922,7 +1022,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "algorytm klucza publicznego %d (%s) nie jest obsługiwany\n"
@@ -937,52 +1037,52 @@ msgstr "algorytm ochrony %d (%s) nie jest obsługiwany\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "algorytm hasza ochrony %d (%s) nie jest obsługiwany\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "błąd tworzenia potoku: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "błąd tworzenia strumienia dla potoku: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "błąd podczas tworzenia procesu: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "oczekiwanie na zakończenie procesu %d nie powiodło się: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "błąd uruchamiania ,,%s'': prawdopodobnie nie zainstalowany\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "błąd uruchamiania ,,%s'': kod wyjścia %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "błąd uruchamiania ,,%s'': zakończono\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "oczekiwanie na zakończenie procesów nie powiodło się: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "błąd odczytu kodu zakończenia procesu %d: %s\n"
@@ -1012,12 +1112,12 @@ msgstr "Ostrzeżenie: niebezpieczne prawa własności do %s ,,%s''\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Ostrzeżenie: niebezpieczne prawa dostępu do %s ,,%s''\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "oczekiwanie aż plik ,,%s'' stanie się dostępny...\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
@@ -1077,22 +1177,22 @@ 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:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "błąd przydzielania wystarczającej ilości pamięci: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: przestarzała opcja ,,%s'' - nie ma efektu\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "OSTRZEŻENIE: ,,%s%s'' jest przestarzałą opcją - nie ma efektu\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "nieznana flaga diagnostyczna ,,%s'' zignorowana\n"
@@ -1398,7 +1498,7 @@ msgstr "błędna opcja"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "brak argumentu dla opcji ,,%.50s''\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "błędny argument dla opcji ,,%.50s''\n"
@@ -1428,17 +1528,17 @@ msgstr "polecenie ,,%.50s'' jest niejednoznaczne\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "błędna opcja ,,%.50s''\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "Uwaga: brak domyślnego pliku opcji ,,%s''\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1458,41 +1558,41 @@ msgstr "iconv_open nie powiodło się: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konwersja z ,,%s'' do ,,%s'' nie powiodła się: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "nie udało się utworzyć pliku tymczasowego ,,%s'': %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "błąd zapisu do ,,%s'': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "usuwanie nieaktualnego pliku blokady (utworzonego przez %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "oczekiwanie na blokadÄ™ (trzymanÄ… przez %d%s) %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(zakleszczenie?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "blokada ,,%s'' nie założona: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "oczekiwanie na blokadÄ™ %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "biblioteka %s jest zbyt stara (wymagana %s, zainstalowana %s)\n"
@@ -1718,22 +1818,22 @@ msgstr "niedopuszczalne przekierowanie HTTP z serwera zostało wyczyszczone"
 msgid "server uses an invalid certificate"
 msgstr "serwer używa błędnego certyfikatu"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, c-format
 msgid "Note: %s\n"
 msgstr "Uwaga: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, 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:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1749,8 +1849,8 @@ msgstr "To polecenie jest dostępne tylko dla kart w wersji 2\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1760,120 +1860,120 @@ msgstr "Twój wybór? "
 msgid "[not set]"
 msgstr "[nie ustawiono]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr "Pan"
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr "Pani"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "nie wymuszono"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "wymuszono"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "BÅ‚Ä…d: aktualnie dopuszczalne jest tylko czyste ASCII.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Błąd: znak ,,<'' nie może być użyty.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Błąd: podwójne spacje nie są dopuszczalne.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Nazwisko posiadacza karty: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "ImiÄ™ posiadacza karty: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "URL do odczytania klucza publicznego: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "błąd odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "błąd zapisu ,,%s'': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Dane logowania (nazwa konta): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Prywatne dane DO: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Preferowane języki: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Błąd: niewłaściwa długość tekstu preferencji.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Błąd: niewłaściwe znaki w tekście preferencji.\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Tutuł (M = Pan, F = Pani lub spacja): "
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Błąd: niewłaściwa odpowiedź.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "Odcisk CA:"
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Błąd: niewłaściwie sformatowany odcisk.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operacja na kluczu niewykonalna: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "to nie jest karta OpenPGP"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Zastąpić istniejący klucz? (t/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1883,97 +1983,97 @@ msgstr ""
 "       Jeśli tworzenie klucza nie powiedzie się, proszę sprawdzić\n"
 "       dokumentację karty, aby poznać dozwolone rozmiary.\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej długości klucz wygenerować? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrąglono do %u bitów\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "Rozmiary kluczy %s muszą być z przedziału %u-%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr "Zmiana atrybutu klucza karty dla: "
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 msgid "Signature key\n"
 msgstr "Klucz do podpisów\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 msgid "Encryption key\n"
 msgstr "Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr "Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Proszę wybrać rodzaj klucza:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Niewłaściwy wybór.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "błąd podczas pobierania informacji o karcie: %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 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:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Zastąpić istniejące klucze? (t/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1984,165 +2084,165 @@ msgstr ""
 "   PIN = ,,%s''   PIN administracyjny = ,,%s''\n"
 "Należy je zmienić przy użyciu polecenia --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 msgid "Please select the type of key to generate:\n"
 msgstr "Proszę wybrać rodzaj klucza do wygenerowania:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Klucz do podpisów\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "Proszę wybrać gdzie zapisać klucz:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD nie powiodło się: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr "Kontynuować? (t/N) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Naprawdę przywrócić stan fabryczny? (proszę wpisać ,,yes'') "
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "błąd przy ustawianiu KDF: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "wyjście z tego menu"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "pokazanie poleceń administratora"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "wypisanie wszystkich dostępnych danych"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "zmiana nazwy posiadacza karty"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "zmiana URL-a do odczytu klucza"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "pobranie klucza określonego w URL-u karty"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "zmiana nazwy logowania"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "zmiana preferowanych języków"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr "zmiana tytułu posiadacza karty"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "zmiana odcisku CA"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "zmiana flagi wymuszenia PIN-u do podpisu"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "wygenerowanie nowych kluczy"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "menu do zmiany lub odblokowania PIN-u"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "sprawdzenie PIN-u i wypisanie wszystkich danych"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "odblokowanie PIN-u przy użyciu kodu resetującego"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr "zniszczenie wszystkich kluczy i danych"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr "ustawienie KDF do uwierzytelniania PIN-em"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 msgid "change the key attribute"
 msgstr "zmiana atrybutu klucza"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/karta> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "Polecenie tylko dla administratora\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Polecenia dla administratora sÄ… dozwolone\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "Polecenia dla administratora nie sÄ… dozwolone\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawne polecenie  (spróbuj ,,help'')\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie działa z tym poleceniem\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "nie można otworzyć ,,%s''\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie został odnaleziony: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2203,8 +2303,8 @@ msgid "subkey"
 msgstr "podklucza"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powiódł się: %s\n"
@@ -2245,24 +2345,24 @@ msgstr ""
 msgid "using cipher %s\n"
 msgstr "szyfrem %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr ",,%s'' już jest skompresowany\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "OSTRZEŻENIE: plik ,,%s'' jest pusty\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "szyfr ,,%s'' nie może być używany w trybie %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "algorytm skrótu ,,%s'' nie może być używany w trybie %s\n"
@@ -2285,7 +2385,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "OSTRZEŻENIE: klucz %s nie nadaje się do szyfrowania w trybie %s\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2294,39 +2400,39 @@ msgstr ""
 "OSTRZEŻENIE: wymuszone użycie kompresji %s (%d) kłóci się z ustawieniami "
 "adresata\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami adresata\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "opcja ,,%s'' nie może być używana w trybie %s\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomocÄ… %s\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "OSTRZEŻENIE: wiadomość była szyfrowana kluczem słabym szyfru symetrycznego.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem podczas obróbki pakietu szyfrowego\n"
@@ -2510,214 +2616,274 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "używany jest podklucz %s zamiast klucza głównego %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "poprawne argimenty dla opcji ,,%s'':\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "złożenie podpisu"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "złożenie podpisu pod dokumentem"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "złożenie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domyślne)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpisów"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "wypisanie i sprawdzenie podpisów kluczy"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisków"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "wygenerowanie nowej pary kluczy"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "szybkie wygenerowanie nowej pary kluczy"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr "szybkie dodanie nowego identyfikatora użytkownika"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr "szybkie unieważnienie identyfikatora użytkownika"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr "szybkie ustawienie nowej daty wygaśnięcia"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "wygenerowanie pary kluczy z pełną funkcjonalnością"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu unieważnienia klucza"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "usunięcie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "usunięcie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "szybkie złożenie podpisu na kluczu"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "szybkie złożenie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "quickly revoke a key signature"
 msgstr "szybkie unieważnienie podpisu klucza"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "złożenie podpisu na kluczu"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "złożenie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "zmiana hasła"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "odświeżenie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "import/dołączenie kluczy"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "wyświetlenie stanu karty"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "zmiana danych na karcie"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "zmiana PIN-u karty"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "wypisanie skrótów wiadomości"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "uruchomienie w trybie serwera"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|WARTOŚĆ|ustawienie polityki TOFU dla klucza"
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAZWA|szyfrowanie także dla odbiorcy NAZWA"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|określ adres email"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "ścisłe zachowanie OpenPGP"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "pozostawienie bez zmian"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "pytanie przed nadpisaniem plików"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the input"
+msgstr "Opcje sterujące bezpieczeństwem"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+#, fuzzy
+#| msgid "Options controlling the diagnostic output"
+msgid "Options controlling the output"
+msgstr "Opcje sterujące wyjściem diagnostycznym"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|UŻYTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|PLIK|zapis wyjścia do PLIKU"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr ""
-"|UŻYTKOWNIK|użycie tego identyfikatora użytkownika do podpisania lub "
-"odszyfrowania"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "kanoniczny format tekstowy"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+#, fuzzy
+#| msgid "Options controlling the interactivity and enforcement"
+msgid "Options controlling key import and export"
+msgstr "Opcje sterujące interaktywnością i wymuszaniem"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|PLIK|zapis wyjścia do PLIKU"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
+"|MECHANIZMY|wykorzystaj MECHANIZMY do wyszukiwania kluczy na podstawie "
+"adresów e-mail"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "pozostawienie bez zmian"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "zablokuj dostęp do dirmngr"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "pytanie przed nadpisaniem plików"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+#, fuzzy
+#| msgid "Options controlling the configuration"
+msgid "Options controlling key listings"
+msgstr "Opcje sterujÄ…ce konfiguracjÄ…"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "ścisłe zachowanie OpenPGP"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "lista kluczy prywatnych"
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|UŻYTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr ""
+"|UŻYTKOWNIK|użycie tego identyfikatora użytkownika do podpisania lub "
+"odszyfrowania"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2725,7 +2891,7 @@ msgstr ""
 "@\n"
 "(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2747,11 +2913,11 @@ msgstr ""
 " --list-keys [nazwy]        pokazanie kluczy\n"
 " --fingerprint [nazwy]      pokazanie odcisków kluczy\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Składnia: @GPG@ [opcje] [pliki] (-h wyświetla pomoc)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2761,7 +2927,7 @@ msgstr ""
 "Podpisywanie, sprawdzanie podpisów, szyfrowanie, rozszyfrowywanie\n"
 "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2769,78 +2935,78 @@ msgstr ""
 "\n"
 "Obsługiwane algorytmy:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Skrótów: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "składnia: %s [opcje] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, 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:1627
+#: g10/gpg.c:1653
 #, 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:1630
+#: g10/gpg.c:1656
 #, 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:1636
+#: g10/gpg.c:1662
 #, 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:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2848,21 +3014,21 @@ msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2870,459 +3036,459 @@ msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "wyświetlenie ID zdjęć przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "pokazywanie informacji o zastosowaniu klucza przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "pokazywanie URL-i polityk przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "pokazywanie adnotacji użytkownika przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "pokazywanie URL-i preferowanych serwerów kluczy przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 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:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "pokazywanie unieważnionych i wygasłych podkluczy na listach kluczy"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "pokazywanie dat wygaśnięcia przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "nieznana polityka TOFU ,,%s''\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(,,help'' wyświetli listę wyborów)\n"
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dostępne w trybie %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Uwaga: %s nie jest do normalnego użytku!\n"
 
-#: g10/gpg.c:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, 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:3086
+#: g10/gpg.c:3085
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr ",,%s'' nie jest niepoprawnym adresem e-mail\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "błędny tryb pinentry ,,%s''\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "błędne źródło żądania ,,%s''\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawną nazwą zestawu znaków\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumiały URL serwera kluczy\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "niepoprawne opcje filtrowania: %s\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "wyświetlanie ID zdjęć przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji użytkownika przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "pokazywanie URL-i preferowanych serwerów kluczy przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poprawności ID użytkownika przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 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:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko głównego ID użytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "sprawdzanie podpisów z danymi PKA"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "zwiększenie zaufania podpisów z poprawnymi danymi PKA"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, 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:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, 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:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno używać %s z %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w połączeniu z %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "OSTRZEŻENIE: działanie z fałszywym czasem systemowym: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfrujÄ…cy jest niepoprawny\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów poświadczeń jest niepoprawny\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, 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:3839
+#: g10/gpg.c:3837
 #, 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:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niewłaściwy minimalny poziom sprawdzania; musi mieć wartość 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Uwaga: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mieć wartość 0, 1 lub 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "niewłaściwe domyślne ustawienia\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "niewłaściwe ustawienia szyfrów\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "niewłaściwe ustawienia skrótów\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "niewłaściwe ustawienia algorytmów kompresji\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie działa z %s!\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiodło się: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysyłka do serwera kluczy nie powiodła się: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbiór z serwera kluczy nie powiódł się: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powiódł się: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "eksport do klucza ssh powiódł się: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiodło się: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "odświeżenie kluczy z serwera nie powiodło się: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiodło się: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "błąd analizy specyfikacji klucza ,,%s'': %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, 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:5134
+#: g10/gpg.c:5132
 #, 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:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoją wiadomość ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu poświadczania jest niepoprawny\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
@@ -3335,7 +3501,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
@@ -4048,7 +4214,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisać? (t/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr " Nie da się złożyć podpisu.\n"
 
@@ -4226,8 +4392,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:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "złożenie podpisu nie powiodło się: %s\n"
@@ -4431,7 +4597,7 @@ msgstr ""
 "(ltsign,\n"
 "  tnrsign itd.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Klucz unieważniony."
 
@@ -4481,7 +4647,7 @@ msgstr "Czy na pewno usunąć ten identyfikator użytkownika? (t/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno przenieść główny klucz (t/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybrać dokładnie jeden klucz.\n"
 
@@ -4559,161 +4725,161 @@ msgstr "Zapisać zmiany? (t/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Wyjść bez zapisania zmian? (t/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie został zmieniony więc zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "nie można unieważnić ostatniego identyfikatora użytkownika.\n"
 
-#: g10/keyedit.c:2476
+#: g10/keyedit.c:2532
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "unieważnienie identyfikatora użytkownika nie powiodło się: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "ustawienie głównego identyfikatora użytkownika nie powiodło się: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr ",,%s'' nie jest odciskiem\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr ",,%s'' nie jest głównym odciskiem\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Błędny identyfikator użytkownika ,,%s'': %s\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "Brak pasującego identyfikatora użytkownika."
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "Nie ma nic do podpisania.\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nie podpisane przez ciebie.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "unieważnienie podpisu klucza nie powiodło się: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr ",,%s'' nie jest poprawnym czasem wygaśnięcia\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr ",,%s'' nie jest właściwym odciskiem\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "podklucz ,,%s'' nie został odnaleziony\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Skrót: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "no-modify dla serwera kluczy"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Preferowany serwer kluczy: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Klucze PGP 2.x nie zawierają opisu ustawień.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Ten klucz został unieważniony %s przez klucz użytkownika %s %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz może zostać unieważniony przez klucz %s użytkownika %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(poufne)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "utworzono: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "unieważniono: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "wygasł: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "wygasa: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "użycie: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "nr-karty: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "zaufanie: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "poprawność: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Ten klucz został wyłączony z użytku"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4721,17 +4887,17 @@ msgstr ""
 "Pokazana wartość wiarygodności klucza może być niepoprawna,\n"
 "dopóki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "unieważniony"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "wygasł"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4741,17 +4907,17 @@ msgstr ""
 "             jako główny. Wykonanie tego polecenie może więc spowodować\n"
 "             wyświetlanie innego identyfikatora jako domyślnego głównego.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "OSTRZEŻENIE: podklucz do szyfrowania wkrótce wygaśnie.\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Może warto także zmienić jego datę ważności.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4760,35 +4926,35 @@ msgstr ""
 "OSTRZEŻENIE: To jest klucz PGP wersji 2. Dodanie zdjęcia spowoduje, że\n"
 "             niektóre wersje przestaną go rozumieć.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je dodać? (t/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usunąć ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usunąć ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usunąć ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usunąć ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4796,20 +4962,20 @@ msgstr[0] "%d podpis usunięty.\n"
 msgstr[1] "%d podpisy usunięte.\n"
 msgstr[2] "%d podpisów usuniętych.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zostało usunięte.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator użytkownika ,,%s'' upakowany: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4817,17 +4983,17 @@ msgstr[0] "Identyfikator użytkownika ,,%s'': %d podpis usunięty\n"
 msgstr[1] "Identyfikator użytkownika ,,%s'': %d podpisy usunięte\n"
 msgstr[2] "Identyfikator użytkownika ,,%s'': %d podpisów usuniętych\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identyfikator użytkownika ,,%s'': już zmniejszony.\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identyfikator użytkownika ,,%s'': już czysty.\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4837,215 +5003,215 @@ msgstr ""
 "             unieważniającego spowoduje, że niektóre wersje PGP przestaną\n"
 "             go rozumieć.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie można wyznaczyć klucza unieważniającego.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza unieważniającego: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie można wyznaczyć jako unieważniającego\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie można wyznaczyć klucza do unieważniania jego samego\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "ten klucz został już uznany kluczem unieważniającym\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "OSTRZEŻENIE: nie można cofnąć wyznaczenia klucza jako unieważniającego!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Czy na pewno chcesz wyznaczyć ten klucz jako unieważniający? (t/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Czy na pewno zmienić datę ważności dla wielu podkluczy? (t/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty ważności podklucza.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty ważności głównego klucza.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie można zmienić daty ważności klucza w wersji 3.\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 msgid "Changing usage of a subkey.\n"
 msgstr "Zmiana zastosowań podklucza.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 msgid "Changing usage of the primary key.\n"
 msgstr "Zmiana zastosowań klucza głównego.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podklucz podpisujący %s jest już skrośnie podpisany\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "podklucz %s nie jest podpisujący, więc nie musi być skrośnie podpisany\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Proszę wybrać dokładnie jeden identyfikator użytkownika.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pominięty\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Podaj preferowany URL serwera kluczy: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz go zastąpić? (t/N) "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz go usunąć? (t/N) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Kontynuować? (t/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora użytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora użytkownika o skrócie %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Brak podklucza o identyfikatorze ,,%s''.\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak podklucza o numerze %d.\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identyfikator użytkownika: ,,%s''\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ważność tego klucza wygasła %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go unieważnić? (t/N) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzyć certyfikat unieważnienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (podpis nieunieważnialny) "
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, 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:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz unieważnić te podpisy:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzyć certyfikaty unieważnienia ? (t/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, 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:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator użytkownika ,,%s'' został już unieważniony\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klucz %s jest już unieważniony.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklucz %s jest już unieważniony.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5516,7 +5682,7 @@ msgstr ""
 "entropii.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiodła się: %s\n"
@@ -5587,11 +5753,11 @@ msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "błąd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zostały utworzone i podpisane.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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"
@@ -5599,7 +5765,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5607,7 +5773,7 @@ msgstr ""
 "klucz został stworzony %lu sekundę w przyszłości (zaburzenia\n"
 "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5615,23 +5781,23 @@ msgstr ""
 "klucz został stworzony %lu sekund w przyszłości (zaburzenia\n"
 "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzyć? (t/N) "
 
@@ -5846,83 +6012,83 @@ msgstr "zapytanie o klucz z ,,%s''\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "OSTRZEŻENIE: nie można pobrać URI %s: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "dziwny rozmiar jak na zaszyfrowany klucz sesyjny (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "hasło wygenerowane nieznanym algorytmem skrótu %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny to %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "zaszyfrowano %u-bitowym kluczem %s o identyfikatorze %s, stworzonym %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ,,%s''\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s o identyfikatorze %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "błąd odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "OSTRZEŻENIE: widziano wiele czystych tekstów\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomocą %lu haseł\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym hasłem\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmując że dane zostały zaszyfrowane za pomocą %s\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZEŻENIE: wiadomość nie była zabezpieczona przed manipulacją\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5932,182 +6098,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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Użycie mimo to opcji ,,%s'' do odszyfrowania.\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "wymuszono błąd odszyfrowywania!\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZEŻENIE: zaszyfrowana wiadomość była manipulowana!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "błąd odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "nie znaleziono podpisu\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pominięcie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, 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:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpisano w %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               przy użyciu klucza %s %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                        wystawca ,,%s''\n"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Klucz dostępny w: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, 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:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias ,,%s''"
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Ważność podpisu wygasła %s.\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Ważność podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "podpis %s, algorytm skrótu %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ", algorytm klucza "
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, 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:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie można sprawdzić podpisu: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
@@ -6176,34 +6342,34 @@ msgstr "(zgłoszony błąd: %s <%s>)\n"
 msgid "(further info: "
 msgstr "(dalsze informacje: "
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: przestarzała opcja ,,%s''\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce należy użyć ,,%s%s''\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "OSTRZEŻENIE: ,,%s'' jest przestarzałym poleceniem - nie należy go używać\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
 "%s:%u: ,,%s'' jest przestarzałe w tym pliku - ma znaczenie tylko w %s\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
@@ -6211,37 +6377,37 @@ msgstr ""
 "OSTRZEŻENIE: ,,%s%s'' jest przestarzałą opcją - nie ma efektu z wyjątkiem "
 "%s\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "nieskompresowany|brak"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "ta wiadomość może nie dać się odczytać za pomocą %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "niejednoznaczna opcja ,,%s''\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "klucz publiczny ECDSA powinien być w kodowaniu SEC wielokrotnością 8 bitów\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "nieznany słaby skrót ,,%s''\n"
@@ -6274,24 +6440,24 @@ msgstr "zapisywanie na wyjście standardowe\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "przyjęto obecność podpisanych danych w '%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie można obsłużyć tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "OSTRZEŻENIE: symetrycznie zaszyfrowany klucz sesyjny może nie być "
 "bezpieczny\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "Nieznane krytyczne adnotacje podpisu: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -6706,12 +6872,12 @@ msgstr "nieznany domyślny adresat ,,%s''\n"
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresatów\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Uwaga: klucz %s nie ma cechy %s\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Uwaga: klucz %s nie ma preferencji dla %s\n"
@@ -7163,7 +7329,7 @@ msgstr ""
 "klucz algorytmu Elgamala wygenerowany przez PGP nie zapewniajÄ…cy "
 "bezpiecznych podpisów!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powiódł się: %s\n"
@@ -7208,7 +7374,7 @@ msgstr "błąd podczas szukania zapisu wartości zaufania w ,,%s'': %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "błąd odczytu w ,,%s'': %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiodła się %s\n"
@@ -7754,93 +7920,93 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr ",,%s'' nie jest poprawnym długim identyfikatorem klucza\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "klucz %s: zaakceptowany jako klucz zaufany\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "klucz %s jest wpisany więcej niż raz w bazie zaufania\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "klucz %s: brak klucza publicznego dla zaufanego klucza - pominięty\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "klucz %s został oznaczony jako obdarzony absolutnym zaufaniem.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powiódł się: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "wpis zaufania %lu jest typu innego niż poszukiwany %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "Można próbować odtworzyć bazę zaufania przy użyciu poleceń:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Jeśli to nie działa, należy poradzić się instrukcji\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nie można użyć nieznanego modelu zaufania (%d) - przyjęto model zaufania %s\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "użycie modelu zaufania %s\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "następne sprawdzanie bazy odbędzie się %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "nie ma potrzeby sprawdzania trustdb przy modelu zaufania ,,%s''\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "nie ma potrzeby uaktualniania trustdb przy modelu zaufania ,,%s''\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "klucz publiczny %s nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "należy uruchomić gpg z opcją ,,--check-trustdb''\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -7848,7 +8014,7 @@ msgstr[0] "przetworzono %d klucz"
 msgstr[1] "przetworzono %d klucze"
 msgstr[2] "przetworzono %d kluczy"
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -7856,17 +8022,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7874,30 +8040,30 @@ msgstr ""
 "poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,"
 "%du\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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"
 
@@ -7909,39 +8075,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   ]"
 
@@ -7989,34 +8155,34 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNumer: %s%%0AWłaściciel: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Pozostało prób: %d"
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Proszę wprowadzić PIN administracyjny"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Proszę wprowadzić PIN dla zwykłych kluczy."
 
@@ -8088,7 +8254,7 @@ msgstr "nie powiódł się zapis odcisku: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "nie powiódł się zapis daty utworzenia: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "błąd podczas odczytu stanu CHV z karty\n"
@@ -8153,7 +8319,7 @@ msgstr "PIN dla CHV%d jest zbyt krótki; minimalna długość to %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "weryfikacja CHV%d nie powiodła się: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "karta została trwale zablokowana!\n"
@@ -8299,7 +8465,7 @@ msgstr "karta nie obsługuje algorytmu skrótu %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "dotychczas stworzono podpisów: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8307,7 +8473,7 @@ msgstr ""
 "weryfikacja PIN-u administracyjnego tym poleceniem jest aktualnie "
 "zabroniona\n"
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie można dostać się do %s - niepoprawna karta OpenPGP?\n"
@@ -8323,55 +8489,55 @@ msgstr "||Proszę wprowadzić PIN na klawiaturze czytnika"
 msgid "|N|Initial New PIN"
 msgstr "|N|PoczÄ…tkowy nowy PIN"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|PLIK|zapisanie logów do PLIKu"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|połączenie z czytnikiem na porcie N"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAZWA|użycie NAZWY jako sterownika ct-API"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAZWA|użycie NAZWY jako sterownika PC/SC"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "nieużywanie wewnętrznego sterownika CCID"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|odłączenie karty po N sekundach nieaktywności"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "nieużywanie klawiatury czytnika"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "zabronienie używania poleceń karty administratora"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "użycie wejścia z klawiatury czytnika o zmiennej długości"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "zabronienie używania poleceń karty administratora"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Składnia: @SCDAEMON@ [opcje] (-h wyświetla pomoc)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8379,21 +8545,27 @@ msgstr ""
 "Składnia: scdaemon [opcje] [polecenie [argumenty]]\n"
 "Demon kart procesorowych dla @GNUPG@\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "proszę użyć opcji ,,--daemon'' do uruchomienia programu w tle\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "obsługa fd %d uruchomiona\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obsługa fd %d zakończona\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "błąd pobierania informacji o zastosowaniu klucza: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8451,7 +8623,7 @@ msgstr "poszukiwanie wystawcy na zewnÄ…trz\n"
 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:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "nie można uzyskać authorityInfoAccess: %s\n"
@@ -8612,7 +8784,7 @@ msgstr "główny certyfikat nie jest oznaczony jako zaufany"
 msgid "checking the trust list failed: %s\n"
 msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "łańcuch certyfikatów zbyt długi\n"
@@ -8666,7 +8838,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "skrót %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8677,7 +8849,7 @@ msgstr "brak pamięci\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(to jest algorytm MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "brak"
 
@@ -8711,42 +8883,37 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "stworzony %s, wygasa %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "nie podano zastosowania klucza - przyjęto wszystkie zastosowania\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "błąd pobierania informacji o zastosowaniu klucza: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certyfikat nie powinien być używany do poświadczania\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certyfikat nie powinien być używany do podpisywania odpowiedzi OCSP\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certyfikat nie powinien być używany do szyfrowania\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certyfikat nie powinien być używany do podpisywania\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certyfikat nie nadaje siÄ™ do szyfrowania\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certyfikat nie nadaje siÄ™ do podpisywania\n"
@@ -8934,6 +9101,11 @@ msgstr "Stworzyć własnoręcznie podpisany certyfikat? (t/N) "
 msgid "These parameters are used:\n"
 msgstr "Użyte będą następujące parametry:\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "błąd tworzenia pliku tymczasowego: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "Tworzenie własnoręcznie podpisanego certyfikatu. "
@@ -9012,123 +9184,123 @@ msgstr "usunięcie certyfikatu ,,%s'' nie powiodło się: %s\n"
 msgid "no valid recipients given\n"
 msgstr "nie podano poprawnych adresatów\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "wypisanie kluczy zewnętrznych"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "wypisanie łańcucha certyfikatów"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "import certyfikatów"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "eksport certyfikatów"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "zarejestrowanie karty procesorowej"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "przekazanie polecenia do dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "wywołanie gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "tworzenie wyjścia zakodowanego base-64"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "nieużywanie w ogóle terminala"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|liczba certyfikatów do dołączenia"
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "przyjęcie wejścia w formacie PEM"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "przyjęcie wejścia w formacie base-64"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "przyjęcie wejścia w formacie binarnym"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "tworzenie wyjścia zakodowanego base-64"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|UŻYTKOWNIK|użycie tego identyfikatora jako domyślnego klucza tajnego"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|PLIK|dodanie tego zbioru kluczy do listy zbiorów kluczy"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "pobranie brakujących certyfikatów wystawców"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAZWA|użycie kodowania NAZWA dla haseł PKCS#12"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "pominięcie CRL"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "niesprawdzanie CRL dla głównych certyfikatów"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "sprawdzenie poprawności przy użyciu OCSP"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|liczba certyfikatów do dołączenia"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "niesprawdzanie polityk certyfikatów"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "pobranie brakujących certyfikatów wystawców"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "nieużywanie w ogóle terminala"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|PLIK|zapisanie logów trybu serwerowego do PLIKU"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAZWA|użycie tego algorytmu szyfrowania NAZWA"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|PLIK|zapisanie logów audytowych do PLIKU"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAZWA|użycie tego algorytmu skrótu wiadomości"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: bez żadnych pytań"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "przyjęcie odpowiedzi ,,tak'' na większość pytań"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "przyjęcie odpowiedzi ,,nie'' na większość pytań"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|PLIK|dodanie tego zbioru kluczy do listy zbiorów kluczy"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|UŻYTKOWNIK|użycie tego identyfikatora jako domyślnego klucza tajnego"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|użycie tego serwera do wyszukiwania kluczy"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAZWA|użycie tego algorytmu szyfrowania NAZWA"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAZWA|użycie tego algorytmu skrótu wiadomości"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|PLIK|zapisanie logów audytowych do PLIKU"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Składnia: @GPGSM@ [opcje] [pliki] (-h wyświetla pomoc)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9139,27 +9311,27 @@ msgstr ""
 "S/MIME\n"
 "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "nieznany model poprawności ,,%s''\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "import wspólnych certyfikatów ,,%s''\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nie można podpisać z użyciem ,,%s'': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "błędne polecenie (nie ma polecenia domyślnego)\n"
@@ -9220,7 +9392,7 @@ msgstr "problem z ponownym odszukaniem certyfikatu: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "błąd zapisywania flag: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "BÅ‚Ä…d - "
 
@@ -9256,7 +9428,7 @@ msgstr ""
 "\n"
 "%s%sNa pewno chcesz to zrobić?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9308,23 +9480,23 @@ msgstr "[nie podano daty]"
 msgid "algorithm:"
 msgstr "algorytm:"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr "błędny podpis: atrybut skrótu wiadomości nie zgadza się z obliczonym\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Poprawny podpis złożony przez"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "                        alias"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "To jest podpis kwalifikowany\n"
@@ -10118,114 +10290,137 @@ msgstr "oczekiwano bezwzględnej nazwy pliku\n"
 msgid "looking up '%s'\n"
 msgstr "wyszukiwanie ,,%s''\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "lista zawartości pamięci podręcznej CRL"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|PLIK|załadowanie CRL z PLIKU do pamięci podręcznej"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|pobranie CRL z URL-a"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "wyłączenie dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "zapis pamięci podręcznej"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|PLIK|zapis logów trybu serwera do PLIKU"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr "zezwolenie na sprawdzenie wersji oprogramowania online"
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "działanie bez pytania użytkownika"
+#: dirmngr/dirmngr.c:218
+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:196
-msgid "force loading of outdated CRLs"
-msgstr "wymuszenie Å‚adowania nieaktualnych CRL"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "zezwolenie na wysyłanie żądań OCSP"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
+msgstr "trasowanie całego ruchu sieciowego przez Tora"
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
-msgstr "zezwolenie na sprawdzenie wersji oprogramowania online"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "Konfiguracja dla serwerów kluczy"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|używaj serwera kluczy URL"
+
+#: dirmngr/dirmngr.c:244
+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:200
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr "Konfiguracja dla serwerów HTTP"
+
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "powstrzymanie od użycia HTTP"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "powstrzymanie od użycia LDAP"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorowanie punktów dystrybucji CRL przez HTTP"
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
-msgstr "ignorowanie punktów dystrybucji CRL przez LDAP"
-
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "ignorowanie URL-i usług OCSP zawartych w certyfikatach"
-
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|przekierowanie wszystkich żądań HTTP na URL"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "użycie systemowego ustawienia proxy HTTP"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "Konfiguracja używanych serwerów LDAP"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "powstrzymanie od użycia LDAP"
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr "ignorowanie punktów dystrybucji CRL przez LDAP"
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|użycie HOSTA do zapytań LDAP"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "bez użycia hostów zapasowych z --ldap-proxy"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|użycie tego serwera do wyszukiwania kluczy"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|PLIK|odczyt listy serwerów LDAP z PLIKU"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 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:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|ustawienie limitu czasu LDAP na N sekund"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "Konfiguracja dla OCSP"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "zezwolenie na wysyłanie żądań OCSP"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ignorowanie URL-i usług OCSP zawartych w certyfikatach"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|użycie respondera OCSP spod URL-a"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|odpowiedź OCSP podpisana przez FPR"
 
-#: dirmngr/dirmngr.c:235
-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:240
-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
-msgid "route all network traffic via Tor"
-msgstr "trasowanie całego ruchu sieciowego przez Tora"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "wymuszenie Å‚adowania nieaktualnych CRL"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10234,11 +10429,11 @@ msgstr ""
 "@\n"
 "(pełną listę poleceń i opcji można znaleźć w podręczniku ,,info'')\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Składnia: @DIRMNGR@ [opcje] (-h wyświetla pomoc)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10246,84 +10441,84 @@ msgstr ""
 "Składnia: @DIRMNGR@ [opcje] [polecenie [argumenty]]\n"
 "Dostęp do serwera kluczy, CRL i OCSP dla @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "poprawne poziomy diagnostyki to: %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "składnia: %s [opcje]"
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "dwukropki nie sÄ… dozwolone w nazwie gniazda\n"
 
-#: dirmngr/dirmngr.c:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "pobranie CRL z ,,%s'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "przetworzenie CRL z ,,%s'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: linia zbyt długa - pominięto\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: wykryto błędny odcisk\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: błąd odczytu: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, 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:1955
+#: dirmngr/dirmngr.c:1949
 #, 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:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "otrzymano SIGUSR2 - nie zdefiniowano akcji\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "otrzymano SIGTERM - zamykanie...\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "otrzymano SIGTERM - nadal są aktywne połączenia: %d\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "wymuszono zamknięcie\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "otrzymano SIGINT - natychmiastowe zamknięcie\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "otrzymano sygnał %d - nie zdefiniowano akcji\n"
@@ -10513,92 +10708,92 @@ msgstr "liczenie skrótu odpowiedzi OCSP dla ,,%s'' nie powiodło się: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "nie podpisane domyślnym certyfikatem podpisującego OCSP"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 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:540 dirmngr/ocsp.c:727
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "błąd pobierania ID respondera: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 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:636
 #, 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:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "nie zdefiniowano domyślnego respondera OCSP\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, 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:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "użycie respondera OCSP ,,%s''\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, 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:792
 #, 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:793
 msgid "good"
 msgstr "poprawny"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, 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:846
 #, 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:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "responder OCSP zwrócił stan zbyt stary\n"
@@ -10608,67 +10803,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:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "brak pola serialno w ID certyfikatu"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "błąd wysyłania danych: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "przekroczono max_replies %d\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "nie można przydzielić struktury sterującej: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "nie udało się przydzielić kontekstu assuan: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "nie udało się zainicjować serwera: %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Problem z accept u Assuana: %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Przetwarzanie u Assuana nie powiodło się: %s\n"
@@ -10711,7 +10906,7 @@ msgstr "łańcuch certyfikatów jest dobry\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certyfikat nie powinien być używany do podpisywania CRL\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "cicho"
 
@@ -10804,278 +10999,132 @@ msgstr "wysyłanie linii nie powiodło się: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "błąd wysyłania standardowych opcji: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Opcje sterujące wyjściem diagnostycznym"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Opcje sterujÄ…ce konfiguracjÄ…"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Opcje przydatne do diagnostyki"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Opcje sterujące bezpieczeństwem"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|przedawnienie kluczy SSH po N sekundach"
-
-#: tools/gpgconf-comp.c:541
-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"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|ustawienie maksymalnego czasu życia kluczy SSH na N sekund"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Opcje wymuszające politykę haseł"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "niezezwalanie na pominięcie polityki haseł"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|ustawienie minimalnej długości nowych haseł na N"
-
-#: tools/gpgconf-comp.c:580
-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"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|PLIK|sprawdzanie nowych haseł pod kątem wzorców z PLIKU"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|przedawnianie haseł po N dniach"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "niezezwalanie na ponowne użycie starych haseł"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|ustawienie limitu czasu Pinentry na N sekund"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAZWA|szyfrowanie także dla odbiorcy NAZWA"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|określ adres email"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "Konfiguracja dla serwerów kluczy"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL|używaj serwera kluczy URL"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-"|MECHANIZMY|wykorzystaj MECHANIZMY do wyszukiwania kluczy na podstawie "
-"adresów e-mail"
-
-#: tools/gpgconf-comp.c:764
-msgid "import missing key from a signature"
-msgstr "import brakujÄ…cego klucza z podpisu"
-
-#: tools/gpgconf-comp.c:767
-msgid "include the public key in signatures"
-msgstr "włączanie klucza publicznego do podpisów"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "zablokuj dostęp do dirmngr"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAZWA|użycie kodowania NAZWA dla haseł PKCS#12"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "niesprawdzanie CRL dla głównych certyfikatów"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Opcje sterujące formatem wyjścia"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Opcje sterujące interaktywnością i wymuszaniem"
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr "Opcje sterujące użyciem Tora"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "Konfiguracja dla serwerów HTTP"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "użycie systemowego ustawienia proxy HTTP"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "Konfiguracja używanych serwerów LDAP"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "lista serwerów LDAP"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "Konfiguracja dla OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr "Klucze prywatne"
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr "Karty procesorowe"
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr "Sieć"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr "Wpisywanie hasła"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "Komponent nie nadaje siÄ™ do uruchomienia"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Plik konfiguracyjny komponentu %s jest uszkodzony\n"
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Zewnętrzna weryfikacja komponentu %s nie powiodła się"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Uwaga, określenia grup są ignorowane\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "błąd zamykania ,,%s''\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "błąd analizy ,,%s''\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "lista wszystkich komponentów"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "sprawdzenie wszystkich programów"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENT|wypisanie opcji"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENT|zmiana opcji"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENT|zaznaczenie opcji"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "zastosowanie globalnych wartości domyślnych"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr "|PLIK|uaktualnienie plików konfiguracyjnych przy użyciu PLIKU"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "pobranie katalogów konfiguracyjnych dla @GPGCONF@"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "wyświetl globalny plik konfiguracyjny"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "sprawdzenie globalnego pliku konfiguracyjnego"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr "odpytanie bazy danych wersji oprogramowania"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "ponowne załadowanie wszystkich lub podanych komponentów"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "uruchomienie podanego komponentu"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "zabicie podanego komponentu"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "plik wyjściowy"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "uaktywnienie zmian w czasie działania o ile to możliwe"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Składnia: @GPGCONF@ [opcje] (-h wyświetla pomoc)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11083,15 +11132,15 @@ msgstr ""
 "Składnia: @GPGCONF@ [opcje]\n"
 "Zarządzanie opcjami konfiguracji dla narzędzi z systemu @GNUPG@\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Wymagany jest jeden argument komponentu"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Nie znaleziono komponentu"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "Argument nie jest dozwolony"
 
@@ -11108,6 +11157,36 @@ msgstr ""
 "Składnia: gpg-check-pattern [opcje] plik-wzorców\n"
 "Sprawdzanie hasła ze standardowego wejścia względem pliku wzorców\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "błąd zapisu do pliku tymczasowego: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "użycie pliku loga dla serwera"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|PLIK|zapisanie logów trybu serwerowego do PLIKU"
+
+#~ msgid "run without asking a user"
+#~ msgstr "działanie bez pytania użytkownika"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
+
+#~ msgid "import missing key from a signature"
+#~ msgstr "import brakujÄ…cego klucza z podpisu"
+
+#~ msgid "include the public key in signatures"
+#~ msgstr "włączanie klucza publicznego do podpisów"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "Opcje sterujące formatem wyjścia"
+
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Opcje sterujące użyciem Tora"
+
+#~ msgid "LDAP server list"
+#~ msgstr "lista serwerów LDAP"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "zapytanie o klucz %s z serwera %s %s\n"
 
@@ -11279,9 +11358,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "nie udało się otworzyć %s do zapisu: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "błąd zapisu do %s: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "błąd odczytu z %s: %s\n"
 
diff --git a/po/pt.po b/po/pt.po
index 7e7166a..e1be8fc 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -136,8 +136,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr ""
 
@@ -187,13 +187,47 @@ msgstr "MPI incorreto"
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, 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:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "muda a frase secreta"
+
+#: agent/command.c:2423
+#, 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:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protecção %d%s não é suportado\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -201,189 +235,172 @@ msgstr "algoritmo de protecção %d%s não é suportado\n"
 msgid "can't create '%s': %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, fuzzy, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "erro na criação da frase secreta: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nenhum porta-chaves secreto com permissões de escrita encontrado: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "muda a frase secreta"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de dispersão: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erro na criação da frase secreta: %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "a escrever para `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Insira a frase secreta\n"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Usar esta chave de qualquer modo? "
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, 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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -391,7 +408,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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -399,100 +416,99 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-#, fuzzy
-msgid ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
 msgstr ""
-"@\n"
-"Opções:\n"
-" "
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "A chave foi substituída"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "detalhado"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "ser mais silencioso"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:192
-#, fuzzy
-msgid "use a log file for the server"
-msgstr "procurar chaves num servidor de chaves"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "detalhado"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "ser mais silencioso"
+
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confiança"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:213
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
@@ -500,214 +516,292 @@ msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "não suportado"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "não suportado"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
 #: agent/gpg-agent.c:244
-msgid "do not use the PIN cache when signing"
+msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:248
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:250
 #, 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:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:258
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:276
 #, fuzzy
-#| msgid "not supported"
-msgid "enable ssh support"
-msgstr "não suportado"
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|usar mode de frase secreta N"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:278
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "erro na criação da frase secreta: %s\n"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:283
 #, fuzzy
-#| msgid "not supported"
-msgid "enable putty support"
-msgstr "não suportado"
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "utilizar o gpg-agent"
+
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, 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:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, 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:2374
+#: agent/gpg-agent.c:2356
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opções:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -719,8 +813,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -728,9 +822,8 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -784,43 +877,43 @@ msgstr "cancelado pelo utilizador\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "armadura: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "partes da chave secreta não disponíveis\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "armadura: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -833,19 +926,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -858,7 +951,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -868,48 +961,48 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 msgid "Delete key"
 msgstr "activa uma chave"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -940,7 +1033,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -958,52 +1051,52 @@ msgstr "algoritmo de protecção %d%s não é suportado\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "algoritmo de protecção %d%s não é suportado\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
@@ -1034,12 +1127,12 @@ msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "actualização falhou: %s\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
@@ -1101,22 +1194,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1456,7 +1549,7 @@ msgstr "opções de importação inválidas\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opções de importação inválidas\n"
@@ -1486,19 +1579,19 @@ msgstr ""
 msgid "invalid option \"%.50s\"\n"
 msgstr "opções de importação inválidas\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "ficheiro de opções `%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1518,41 +1611,41 @@ msgstr "impossível abrir %s: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "chave pública %08lX não encontrada: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1791,23 +1884,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
@@ -1823,8 +1916,8 @@ msgstr "Este comando não é permitido no modo %s.\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1834,230 +1927,230 @@ msgstr "Opção? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 #, fuzzy
 msgid "not forced"
 msgstr "não processado"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave pública para `%s'\n"
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferências actualizadas"
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inválido na cadeia de caractéres da preferência\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inválido na cadeia de caractéres da preferência\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impressão digital"
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, 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:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2065,184 +2158,184 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 #, 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:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revocação: "
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confiança"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muda os valores de confiança"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output não funciona para este comando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "impossível abrir `%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2305,8 +2398,8 @@ msgid "subkey"
 msgstr "Chave pública: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualização falhou: %s\n"
@@ -2346,26 +2439,26 @@ msgstr "não é possível utilizar o pacote ESK simétrico devido ao modo S2K\n"
 msgid "using cipher %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "%s' já comprimido\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "AVISO: `%s' é um ficheiro vazio\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
@@ -2388,7 +2481,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2397,41 +2496,41 @@ msgstr ""
 "ao forçar o algoritmo de compressão %s (%d) viola as preferências do "
 "destinatário\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi cifrada com uma chave fraca na cifragem simétrica.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao tratar pacote cifrado\n"
@@ -2622,239 +2721,290 @@ msgstr "Chave inválida %08lX tornada válida por --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 #, fuzzy
 msgid "make a signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra simétrica"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "decifrar dados (acção por omissão)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves público"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
-msgid "create ascii armored output"
-msgstr "criar saída com armadura ascii"
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
+#: g10/gpg.c:596 sm/gpgsm.c:332
 #, fuzzy
-msgid "|USER-ID|encrypt for USER-ID"
+msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-#, fuzzy
-msgid "|USER-ID|use USER-ID to sign or decrypt"
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
 msgstr ""
-"usar este identificador de utilizador para\n"
-"assinar ou decifrar"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "não fazer alterações"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "perguntar antes de sobrepôr"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr ""
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr ""
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
+msgid "create ascii armored output"
+msgstr "criar saída com armadura ascii"
+
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
+
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "usar modo de texto canônico"
+
+#: g10/gpg.c:743
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "usar modo de texto canônico"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr ""
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
+
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr ""
+
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr ""
+
+#: g10/gpg.c:803 sm/gpgsm.c:324
 #, fuzzy
-msgid "|FILE|write output to FILE"
-msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "não fazer alterações"
+#: g10/gpg.c:805 sm/gpgsm.c:326
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "perguntar antes de sobrepôr"
+#: g10/gpg.c:813 sm/gpgsm.c:328
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr ""
+"usar este identificador de utilizador para\n"
+"assinar ou decifrar"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2862,7 +3012,7 @@ msgstr ""
 "@\n"
 "(Veja a página man para uma lista completa de comandos e opções)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2892,13 +3042,13 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2913,7 +3063,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2921,550 +3071,550 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Chave pública: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Dispersão: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Compressão: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: gpg [opções] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "nenhum sinal = encontrada na definição de grupo \"%s\"\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, 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:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, 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:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "criado um novo ficheiro de configuração `%s'\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave está"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando não é permitido no modo %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, 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:3086
+#: g10/gpg.c:3085
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, 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:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, 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:3218
+#: g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 #, 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:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, 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:3517
+#: g10/gpg.c:3511
 #, 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:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrepõe %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, 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:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, fuzzy, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) não é recomendável\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferências por omissão inválidas\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferências pessoais de cifra inválidas\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferências pessoais de 'digest' inválidas\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferências pessoais de compressão inválidas\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, 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:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, fuzzy, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, 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:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, 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:5492
+#: g10/gpg.c:5490
 #, 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:5525
+#: g10/gpg.c:5523
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de política de assinatura dada é inválida\n"
@@ -3479,7 +3629,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informações de estado para o\n"
@@ -4190,7 +4340,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Não foi possível assinar.\n"
 
@@ -4392,8 +4542,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -4606,7 +4756,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "A chave está revogada."
 
@@ -4659,7 +4809,7 @@ msgstr "Realmente remover este ID de utilizador? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
@@ -4747,169 +4897,169 @@ msgstr "Gravar alterações? "
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valor inválido\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Características: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 #, fuzzy
 msgid "Notations: "
 msgstr "Notação: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Não há preferências no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensível)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4917,37 +5067,37 @@ msgstr ""
 "Não se esqueça que a validade de chave mostrada não é necessáriamente a\n"
 "correcta a não ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4956,36 +5106,36 @@ msgstr ""
 "AVISO: Esta chave é do tipo PGP2. Se adicionar um identificador fotográfico\n"
 "       algumas versão do PGP podem rejeitá-la.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicioná-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -4993,38 +5143,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d assinatura removida.\n"
 msgstr[1] "%d assinatura removida.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inválida"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" está revocado."
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Utilizador \"%s\" está revocado."
 msgstr[1] "Utilizador \"%s\" está revocado."
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5033,223 +5183,223 @@ msgstr ""
 "AVISO: Esta chave é do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas versão do PGP podem rejeitá-la.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Não pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "não pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 #, 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:5344
+#: g10/keyedit.c:5400
 #, 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:5404
+#: g10/keyedit.c:5460
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notação de assinatura: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr "  (não-exportável)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 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:6026
+#: g10/keyedit.c:6082
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:6055
+#: g10/keyedit.c:6111
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (não-exportável)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revogação? (s/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5726,7 +5876,7 @@ msgstr ""
 "uma hipótese maior de ganhar entropia suficiente.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
@@ -5797,11 +5947,11 @@ msgstr "nenhum porta-chaves público com permissões de escrita encontrado: %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:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5810,7 +5960,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5818,7 +5968,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5826,23 +5976,23 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
@@ -6059,268 +6209,268 @@ msgstr "a pedir a chave %08lX de %s\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamanho estranho para uma chave de sessão cifrada (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "tamanho estranho para uma chave de sessão cifrada (%d)\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, fuzzy, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, 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:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, 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:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, fuzzy, c-format
 msgid "Key available at: "
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 #, fuzzy
 msgid "unknown"
 msgstr "versão desconhecida"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritmo de chave pública desconhecido"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "não é uma assinatura separada\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
@@ -6389,69 +6539,69 @@ msgstr "armadura: %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opção depreciada \"%s\"\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 #, fuzzy
 msgid "Uncompressed"
 msgstr "não processado"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "não processado"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "esta mensagem poderá não ser utilizável pelo %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "a ler opções de `%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "classe de assinatura desconhecida"
@@ -6487,23 +6637,23 @@ msgstr "a escrever em \"stdout\"\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notação de assinatura crítica: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
@@ -6924,12 +7074,12 @@ msgstr "destinatário por omissão desconhecido `%s'\n"
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
@@ -7362,7 +7512,7 @@ msgstr ""
 "ignorado `%s': esta é uma chave ElGamal gerada pelo PGP que não é segura "
 "para assinaturas!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n"
@@ -7408,7 +7558,7 @@ msgstr "%s: erro ao escrever registo de diretório: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confiança: sincronização falhou: %s\n"
@@ -7915,147 +8065,147 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' não é um identificador longo de chave válido\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "chave %08lX: aceite como chave de confiança\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "chave %08lX ocrreu mais do que uma vez na base de dados de confiança\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: nenhuma chave pública para chave de confiança - ignorada\n"
 "\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "chave marcada como de confiança absoluta\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registo de confiança %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registo de confiança %lu não é do tipo pedido %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "não é necessária uma verificação da base de dados de confiança\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verificação da base de dados de confiança a %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "não é necessária uma verificação da base de dados de confiança\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "não é necessária uma verificação da base de dados de confiança\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave pública %08lX não encontrada: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confiança\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, 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:2007
+#: g10/trustdb.c:2050
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:2077
+#: g10/trustdb.c:2120
 #, 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:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 ""
 
@@ -8067,42 +8217,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 ""
 
@@ -8150,35 +8300,35 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "motivo da revocação: "
 
-#: scd/app-p15.c:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muda a frase secreta"
@@ -8246,7 +8396,7 @@ msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
@@ -8311,7 +8461,7 @@ msgstr ""
 msgid "verify CHV%d failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
@@ -8457,13 +8607,13 @@ msgstr "assinatura %s de: \"%s\"\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
@@ -8480,81 +8630,87 @@ msgstr "muda a frase secreta"
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:179
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "comandos em conflito\n"
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
-msgstr ""
-
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8613,7 +8769,7 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8779,7 +8935,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -8833,7 +8989,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -8844,7 +9000,7 @@ msgstr "não processado"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 #, fuzzy
 msgid "none"
 msgstr "não"
@@ -8882,42 +9038,37 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, fuzzy, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
@@ -9112,6 +9263,11 @@ msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erro na criação da frase secreta: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9189,136 +9345,138 @@ msgstr "remoção do bloco de chave falhou: %s\n"
 msgid "no valid recipients given\n"
 msgstr "resposta do agente inválida\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "import certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 #, fuzzy
 msgid "export certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:258
-#, fuzzy
-msgid "create base-64 encoded output"
-msgstr "criar saída com armadura ascii"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "nunca usar o terminal"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:278
-msgid "never consult a CRL"
-msgstr ""
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "criar saída com armadura ascii"
 
-#: sm/gpgsm.c:288
-msgid "check validity using OCSP"
+#: sm/gpgsm.c:330
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|NOME|usar NOME como chave secreta por omissão"
+
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
+"adicionar este porta-chaves\n"
+"à lista de porta-chaves"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
+#: sm/gpgsm.c:354
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
+"|NOME|usar algoritmo de criptografia NOME para\n"
+"frases secretas"
 
-#: sm/gpgsm.c:299
-msgid "do not check certificate policies"
+#: sm/gpgsm.c:372
+msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "nunca usar o terminal"
+#: sm/gpgsm.c:380
+msgid "check validity using OCSP"
+msgstr ""
 
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:382
+msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
-#, fuzzy
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
+
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "modo não-interactivo: nunca perguntar"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: sm/gpgsm.c:329
+#: sm/gpgsm.c:418
 #, fuzzy
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr ""
-"adicionar este porta-chaves\n"
-"à lista de porta-chaves"
-
-#: sm/gpgsm.c:332
-#, fuzzy
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|NOME|usar NOME como chave secreta por omissão"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-#, fuzzy
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NOME|usar algoritmo de criptografia NOME"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9329,27 +9487,27 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9409,7 +9567,7 @@ msgstr "rev? problema ao verificar revogação: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr ""
 
@@ -9439,7 +9597,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9484,23 +9642,23 @@ msgstr ""
 msgid "algorithm:"
 msgstr "armadura: %s\n"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Assinatura correcta de \""
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "                   ou \""
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -10296,116 +10454,140 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-msgid "run without asking a user"
-msgstr "Sair sem gravar? "
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:242
+#, fuzzy
+msgid "|URL|use keyserver at URL"
+msgstr "não consegui processar a URI do servidor de chaves\n"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
+
+#: dirmngr/dirmngr.c:271
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:227
-#, fuzzy
-msgid "|URL|use OCSP responder at URL"
-msgstr "não consegui processar a URI do servidor de chaves\n"
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr ""
 
-#: dirmngr/dirmngr.c:229
-msgid "|FPR|OCSP response signed by FPR"
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+#: dirmngr/dirmngr.c:285
+#, fuzzy
+msgid "|URL|use OCSP responder at URL"
+msgstr "não consegui processar a URI do servidor de chaves\n"
+
+#: dirmngr/dirmngr.c:287
+msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10418,95 +10600,95 @@ msgstr ""
 "@\n"
 "(Veja a página man para uma lista completa de comandos e opções)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "uso: gpg [opções] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "não processado"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -10699,92 +10881,92 @@ msgstr "verificação da assinatura criada falhou: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 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:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10794,68 +10976,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, 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:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10901,7 +11083,7 @@ msgstr "preferência %c%lu duplicada\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
@@ -10995,310 +11177,157 @@ msgstr "assinatura falhou: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr ""
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr ""
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr ""
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-
-#: tools/gpgconf-comp.c:588
-#, fuzzy
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|usar mode de frase secreta N"
-
-#: tools/gpgconf-comp.c:592
-#, fuzzy
-msgid "do not allow the reuse of old passphrases"
-msgstr "erro na criação da frase secreta: %s\n"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NOME|usar NOME como chave secreta por omissão"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-#, fuzzy
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NOME|cifrar para NOME"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-#, fuzzy
-msgid "|URL|use keyserver at URL"
-msgstr "não consegui processar a URI do servidor de chaves\n"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "importar chaves de um servidor de chaves"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-msgid "include the public key in signatures"
-msgstr "verificar as assinaturas das chaves"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr ""
-
-#: tools/gpgconf-comp.c:838
-#, fuzzy
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr ""
-"|NOME|usar algoritmo de criptografia NOME para\n"
-"frases secretas"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr ""
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr ""
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "erro na rede"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "frase secreta incorrecta"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "chave pública não encontrada"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "list global configuration file"
 msgstr "criado um novo ficheiro de configuração `%s'\n"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 #, fuzzy
 msgid "check global configuration file"
 msgstr "criado um novo ficheiro de configuração `%s'\n"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "actualizar a base de dados de confiança"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "usar como ficheiro de saída"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 #, fuzzy
 msgid "Component not found"
 msgstr "chave pública não encontrada"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 #, fuzzy
 msgid "No argument allowed"
 msgstr "a escrever chave privada para `%s'\n"
@@ -11315,6 +11344,27 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "a escrever para `%s'\n"
+
+#, fuzzy
+#~ msgid "use a log file for the server"
+#~ msgstr "procurar chaves num servidor de chaves"
+
+#, fuzzy
+#~ msgid "run without asking a user"
+#~ msgstr "Sair sem gravar? "
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "importar chaves de um servidor de chaves"
+
+#, fuzzy
+#~ msgid "include the public key in signatures"
+#~ msgstr "verificar as assinaturas das chaves"
+
+#, fuzzy
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "a pedir a chave %08lX de %s\n"
 
@@ -11448,10 +11498,6 @@ msgstr ""
 #~ msgstr "impossível abrir %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "erro na escrita do porta-chaves `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "erro na leitura de `%s': %s\n"
 
@@ -13136,9 +13182,6 @@ msgstr ""
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "nunca usar um MDC para cifrar"
 
-#~ msgid "use the gpg-agent"
-#~ msgstr "utilizar o gpg-agent"
-
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[ficheiro]|escrever ifnroamções de estado para o ficheiro"
 
diff --git a/po/ro.po b/po/ro.po
index e37b2cc..2863240 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -140,8 +140,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "frază-parolă incorectă"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr ""
 
@@ -191,13 +191,48 @@ msgstr "MPI incorect"
 msgid "Bad Passphrase"
 msgstr "frază-parolă incorectă"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, 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:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "schimbă fraza-parolă"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -205,76 +240,64 @@ msgstr "algoritm rezumat %d nu este suportat\n"
 msgid "can't create '%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, fuzzy, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "eroare la obţinerea numărului serial: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nu am găsit nici un inel de chei secret de scris: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "schimbă fraza-parolă"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -282,120 +305,115 @@ msgid ""
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 #, fuzzy
 msgid "Please insert the card with serial number"
 msgstr ""
 "Vă rugăm scoateţi cardul curent şi introducaţi unul cu număr de serie:\n"
 "   %.*s\n"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 #, fuzzy
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 "Vă rugăm scoateţi cardul curent şi introducaţi unul cu număr de serie:\n"
 "   %.*s\n"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|PIN Admin"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Repetaţi acest PIN: "
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Repetaţi acest PIN: "
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repetaţi acest PIN: "
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "eroare la crearea frazei-parolă: %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "%s: eroare scriere înregistrare dir: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduceţi fraza-parolă\n"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Folosiţi oricum această cheie? (d/N) "
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, 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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -403,7 +421,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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -411,315 +429,392 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-#, fuzzy
-msgid ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
 msgstr ""
-"@\n"
-"Opţiuni:\n"
-" "
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Cheia este înlocuită"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "locvace"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "fii oarecum mai tăcut"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:192
-#, fuzzy
-msgid "use a log file for the server"
-msgstr "caută pentru chei pe un server de chei"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "locvace"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "fii oarecum mai tăcut"
+
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizează baza de date de încredere"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "nu este suportat(ă)"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "nu este suportat(ă)"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
 #: agent/gpg-agent.c:244
-msgid "do not use the PIN cache when signing"
+msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:248
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:250
 #, 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:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr ""
+
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr ""
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:258
+#: agent/gpg-agent.c:276
 #, fuzzy
-#| msgid "not supported"
-msgid "enable ssh support"
-msgstr "nu este suportat(ă)"
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|foloseşte modul frază-parolă N"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:278
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "eroare la crearea frazei-parolă: %s\n"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:283
 #, fuzzy
-#| msgid "not supported"
-msgid "enable putty support"
-msgstr "nu este suportat(ă)"
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "foloseÅŸte gpg-agent"
+
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 #| msgid "directory `%s' created\n"
 msgid "directory '%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fstat(%d) a eşuat în %s: %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a eÅŸuat: %s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: sărită: %s\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opţiuni:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -731,8 +826,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -740,9 +835,8 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -799,43 +893,43 @@ msgstr "anulată"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fişier opţiuni `%s': %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "părţi ale cheii secrete nu sunt disponibile\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -848,19 +942,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -873,7 +967,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -883,36 +977,36 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 #, fuzzy
 msgid "Change passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -920,13 +1014,13 @@ msgid ""
 "%%0A?"
 msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "activează cheia"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -957,7 +1051,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -975,52 +1069,52 @@ msgstr "algoritm de protecţie %d%s nu este suportat\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "algoritm de protecţie %d%s nu este suportat\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
@@ -1051,12 +1145,12 @@ msgstr "AVERTISMENT: proprietate nesigură (unsafe) pentru extensia `%s'\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
@@ -1117,22 +1211,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1475,7 +1569,7 @@ msgstr "opţiuni enumerare invalide\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opţiuni enumerare invalide\n"
@@ -1505,19 +1599,19 @@ msgstr ""
 msgid "invalid option \"%.50s\"\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "NOTĂ: nici un fişier opţiuni implicit `%s'\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "fişier opţiuni `%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1537,41 +1631,41 @@ msgstr "nu pot deschide fiÅŸierul: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "cheia publică %s nu a fost găsită: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1815,23 +1909,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "generează un certificat de revocare"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armură: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, 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:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1847,8 +1941,8 @@ msgstr "Această comandă nu este permisă în modul %s.\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1858,226 +1952,226 @@ msgstr "Selecţia d-voastră? "
 msgid "[not set]"
 msgstr "[nesetat(ă)]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "neforţat(ă)"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "forţat(ă)"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdată sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spaţiile duble nu sunt permise.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia publică: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Preferinţe limbă: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalidă pentru şir preferinţe.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide în şir preferinţe.\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Eroare: răspuns invalid.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operaţia pe cheie nu e posibilă: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Înlocuiesc cheia existentă? (d/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ce lungime de cheie doriţi? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjită prin adaos la %u biţi\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "dimensiunile cheii %s trebuie să fie în intervalul %u-%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Selectaţi ce fel de cheie doriţi:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA ÅŸi Elgamal (implicit)\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Selecţie invalidă.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: g10/card-util.c:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, 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:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 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:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "ÃŽnlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2092,174 +2186,174 @@ msgstr ""
 "   PIN = `%s'     PIN Admin = `%s'\n"
 "Ar trebui să le schimbaţi folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 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:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 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:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "Doriţi să-l semnaţi? (d/N) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "ieÅŸi din acest meniu"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "arată comenzi administrare"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "afişează acest mesaj"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "afişează toate datele disponibile"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "schimbă numele purtătorului cardului"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "schimbă URL-ul de unde să fie adusă cheia"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificată de URL-ul de pe card"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "schimbă numele de login"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "schimbă preferinţele de limbă"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "schimbă sexul purtătorului cardului"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "schimbă o amprentă CA"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "comută fanionul PIN de forţare a semnăturii"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "generează noi chei"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "verifică PIN-ul şi listează toate datele"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NUME|foloseÅŸte NUME ca destinatar implicit"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "schimbă încrederea pentru proprietar"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "Comandă numai-administrare\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comandă invalidă  (încercaţi \"ajutor\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru această comandă\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost găsită: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2321,8 +2415,8 @@ msgid "subkey"
 msgstr "Pubkey: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
@@ -2364,27 +2458,27 @@ msgstr "nu pot crea un pachet ESK simetric datorită modului S2K\n"
 msgid "using cipher %s\n"
 msgstr "folosesc cifrul %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fiÅŸier gol\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "nu puteţi folosi algoritmul de cifrare `%s' câtă vreme în modul %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgid "digest algorithm '%s' may not be used in %s mode\n"
@@ -2409,7 +2503,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2418,40 +2518,40 @@ msgstr ""
 "AVERTISMENT: forţând algoritmul de compresie %s (%d) violaţi preferinţele "
 "destinatarului\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "forţând cifrul simetric %s (%d) violaţi preferinţele destinatarului\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "nu puteţi folosi %s câtă vreme în modul %s\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTISMENT: mesajul a fost cifrat cu o cheie slabă din cifrul simetric.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problemă cu mânuirea pachetului cifrat\n"
@@ -2648,234 +2748,285 @@ msgstr "Cheia invalidă %s făcută validă de --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "folosim subcheia %s în loc de cheia primară %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fişier]|crează o semnătură"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fişier]|crează o semnătură text în clar"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "crează o semnătură detaşată"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "cifrează datele"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "cifrează numai cu cifru simetric"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "decriptează datele (implicit)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "verifică o semnătură"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "enumeră chei"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "enumeră chei şi semnături"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "enumeră şi verifică semnăturile cheii"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "enumeră chei şi amprente"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "enumeră chei secrete"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "generează un certificat de revocare"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "ÅŸterge chei de pe inelul de chei public"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "ÅŸterge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "semnează o cheie"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "semnează o cheie local"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "semnează o cheie"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "semnează o cheie local"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "semnează sau editează o cheie"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 #, fuzzy
 msgid "change a passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "exportă chei"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "exportă chei pentru un server de chei"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importă chei de la un server de chei"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "caută pentru chei pe un server de chei"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "actualizează toate cheile de la un server de chei"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importă/combină chei"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "afişează starea cardului"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "schimbă data de pe card"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "schimbă PIN-ul unui card"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "actualizează baza de date de încredere"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fişiere]|afişează rezumate mesaje"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
-msgid "create ascii armored output"
-msgstr "crează ieşire în armură ascii"
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
+#: g10/gpg.c:596 sm/gpgsm.c:332
 #, fuzzy
-msgid "|USER-ID|encrypt for USER-ID"
+msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "foloseÅŸte comportament strict OpenPGP"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "nu face nici o schimbare"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "întreabă înainte de a suprascrie"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr ""
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr ""
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
+msgid "create ascii armored output"
+msgstr "crează ieşire în armură ascii"
+
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
 #, fuzzy
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "foloseÅŸte acest id-utilizator pentru a semna sau decripta"
+msgid "|FILE|write output to FILE"
+msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
+
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "foloseÅŸte modul text canonic"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|setează nivel de compresie N (0 deactivează)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "foloseÅŸte modul text canonic"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr ""
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
+
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr ""
+
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr ""
+
+#: g10/gpg.c:803 sm/gpgsm.c:324
 #, fuzzy
-msgid "|FILE|write output to FILE"
-msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "enumeră chei secrete"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "nu face nici o schimbare"
+#: g10/gpg.c:805 sm/gpgsm.c:326
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "întreabă înainte de a suprascrie"
+#: g10/gpg.c:813 sm/gpgsm.c:328
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "foloseÅŸte acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "foloseÅŸte comportament strict OpenPGP"
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2883,7 +3034,7 @@ msgstr ""
 "@\n"
 "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2913,13 +3064,13 @@ msgstr ""
 " --list-keys [nume]         arată chei\n"
 " --fingerprint [nume]       arată amprente\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2934,7 +3085,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "operaţiunea implicită depinde de datele de intrare\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2942,79 +3093,79 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "folosire: gpg [opţiuni] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comenzi în conflict\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "nu am găsit nici un semn = în definiţia grupului `%s'\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, 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:1627
+#: g10/gpg.c:1653
 #, 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:1630
+#: g10/gpg.c:1656
 #, 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:1636
+#: g10/gpg.c:1662
 #, 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:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, 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:1648
+#: g10/gpg.c:1674
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@ -3022,7 +3173,7 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1677
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3032,7 +3183,7 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fiÅŸier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@ -3040,7 +3191,7 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1660
+#: g10/gpg.c:1686
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@ -3048,7 +3199,7 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1689
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3059,7 +3210,7 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fiÅŸier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@ -3067,469 +3218,469 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 #, 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:2028
+#: g10/gpg.c:2031
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Această comandă nu este permisă în modul %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, 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:3086
+#: g10/gpg.c:3085
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Nu este o adresă de email validă\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, 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:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opţiuni server de chei invalide\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opţiuni server de chei invalide\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opţiuni import invalide\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "opţiuni import invalide\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opţiuni export invalide\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "opţiuni export invalide\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execuţie ca %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, 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:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s înlocuieşte %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, 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:3839
+#: g10/gpg.c:3837
 #, 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:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie să fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTĂ: modul S2K simplu (0) este contraindicat cu insistenţă\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie să fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferinţe implicite invalide\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferinţe cifrare personale invalide\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferinţe rezumat personale invalide\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferinţe compresie personale invalide\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge încă cu %s!\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am eşuat să iniţializez TrustDB:%s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, 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:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepţie server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie eÅŸuat: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, 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:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "căutare server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a eÅŸuat: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a eÅŸuat: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Daţi-i drumul şi scrieţi mesajul ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, 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:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
@@ -3543,7 +3694,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informaţii de stare în acest FD"
 
@@ -4267,7 +4418,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sunteţi sigur(ă) că doriţi să ştergeţi permanent? (d/N)"
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
@@ -4444,8 +4595,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:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a eÅŸuat: %s\n"
@@ -4654,7 +4805,7 @@ msgstr ""
 "  pentru semnături irevocabile (nrsign), sau orice combinaţie a acestora\n"
 "  (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Cheia este revocată."
 
@@ -4705,7 +4856,7 @@ msgstr "Ştergeţi într-adevăr acest ID utilizator? (d/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Mutaţi într-adevăr cheia primară? (d/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie să selectaţi exact o cheie.\n"
 
@@ -4786,173 +4937,173 @@ msgstr "Salvaţi schimbările?  (d/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Terminaţi fără a salva?  (d/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbată aşa că nici o actualizare a fost necesară.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "amprentă invalidă"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valoare invalidă\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Nu există acest ID utilizator.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "Nothing to sign with key %s\n"
 msgid "Nothing to sign.\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "amprentă invalidă"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "cheia \"%s\" nu a fost găsită: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Capabilităţi: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaţie:"
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nu există nici o preferinţă pentru un ID utilizator stil PGP 2.x.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Această cheie a fost revocată pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Această cheie poate fi revocată de %s cheia %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "creată: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "revocată: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "expirată: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "expiră: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "încredere: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Această cheie a fost deactivată"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4961,17 +5112,17 @@ msgstr ""
 "corectă dacă nu reporniţi programul.\n"
 
 #
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "revocată"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "expirată"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4981,18 +5132,18 @@ msgstr ""
 "              Această comandă poate cauza ca un alt ID utilizator\n"
 "              să devină ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Nu puteţi schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5001,35 +5152,35 @@ msgstr ""
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Adăugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP să respingă această cheie.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sunteţi încă sigur(ă) că doriţi să o adăugaţi? (d/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură bună? (d/N/t)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură invalidă? (d/N/t)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură necunoscută? (d/N/t)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Ştergeţi într-adevăr această auto-semnătură? (d/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5037,37 +5188,37 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Am şters %d semnături.\n"
 msgstr[1] "Am şters %d semnături.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Nu am ÅŸters nimic.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "invalid(ă)"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "ID utilizator \"%s\" a fost revocat."
 msgstr[1] "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5077,43 +5228,43 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP să respingă "
 "cheia.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nu puteţi adăuga un revocator desemnat la o cheie stil PGP 2.x.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduceţi ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nu puteţi desemna o cheie ca propriul său revocator desemnat\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "această cheie a fost deja desemnată ca un revocator\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
 "anulată!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5124,183 +5275,183 @@ msgstr ""
 "Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primară.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nu puteţi schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primară.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificată reciproc (cross-"
 "certified)\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Vă rugăm selectaţi exact un ID utilizator.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semnătură v3 sărită pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduceţi URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 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:5344
+#: g10/keyedit.c:5400
 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:5404
+#: g10/keyedit.c:5460
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semnătură: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, 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:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (non-exportabilă)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Această semnătură a expirat pe %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 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:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (non-revocabilă)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocată de cheia d-voastră %s pe %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunteţi pe cale să revocaţi aceste semnături:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 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:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "nici o cheie secretă\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, 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:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocată.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocată.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5771,7 +5922,7 @@ msgstr ""
 "numere aleatoare o şansă mai bună de a aduna destulă entropie.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a eÅŸuat: %s\n"
@@ -5845,11 +5996,11 @@ msgstr "nu am găsit nici un inel de chei public de scris: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secretă şi publică au fost create şi semnate.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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"
@@ -5859,7 +6010,7 @@ msgstr ""
 "să folosiţi comanda \"--edit-key\" pentru a genera o subcheie secundară\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5867,7 +6018,7 @@ msgstr ""
 "cheia a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5875,23 +6026,23 @@ msgstr ""
 "cheia a fost creată %lu secunde în viitor (warp în timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Creaţi într-adevăr? (d/N) "
 
@@ -6108,269 +6259,269 @@ msgstr "cer cheia %s de la %s\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "dimensiune ciudată pentru o cheie de sesiune cifrată (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrată\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "fraza-parolă generată cu un algoritm rezumat necunoscut %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia publică este %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie publică: DEK bun\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrat cu cheia %u-bit %s, ID %s, creată %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie publică a eşuat: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrată cu %lu fraze-parolă\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrată cu 1 frază-parolă\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejată\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "decriptarea a eÅŸuat: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a eÅŸuat: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fiÅŸier original='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Semnătură bună din \"%s\""
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semnătură INCORECTĂ din \"%s\""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semnătură expirată din \"%s\""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semnătură bună din \"%s\""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificare semnătură eliminată\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, 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:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semnătură făcută %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Cheie disponibilă la: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semnătură expirată %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semnătura expiră %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritm pubkey necunoscut"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semnătura: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "nu o semnătură detaşată\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, 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:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semnătură de stil vechi (PGP 2.x)\n"
@@ -6440,70 +6591,70 @@ msgstr "eroare citire în `%s': %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opţiune învechită \"%s\"\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "vă rugăm folosiţi \"%s%s\" în loc\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTISMENT: \"%s\" este o comandă învechită - nu o folosiţi\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "acest mesaj s-ar putea să nu poată fi folosit de %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 #| msgid "ambiguous option `%s'\n"
 msgid "ambiguous option '%s'\n"
 msgstr "opţiune ambiguă `%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown option '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6539,25 +6690,25 @@ msgstr "scriu la stdout\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "presupun date semnate în `%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nu pot mânui algoritmul cu cheie publică %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERTISMENT: cheie de sesiune cifrată simetric potenţial nesigură "
 "(insecure)\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Notare semnătură critică: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
@@ -6993,12 +7144,12 @@ msgstr "destinatar implicit necunoscut \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "nici un destinatar valid\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
@@ -7443,7 +7594,7 @@ msgstr ""
 "aceasta este o cheie ElGamal generată de PGP care nu e sigură pentru "
 "semnături!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "înregistrare încredere %lu, tip %d: scrierea a eşuat: %s\n"
@@ -7491,7 +7642,7 @@ msgstr "eroare găsire înregistrare încredere în `%s': %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sincronizarea a eÅŸuat: %s\n"
@@ -8004,95 +8155,95 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' nu este un ID-cheie de lungime validă\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "cheia %s: acceptată ca cheie de încredere\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "cheia %s apare de mai multe ori în trustdb\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "cheia %s: nici o cheie publică pentru cheia de încredere - sărită\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "cheia %s marcată ca având încredere supremă\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "înregistrare încredere %lu, tip req %d: citirea a eşuat: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "înregistrare încredere %lu nu este de tipul cerut %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nu pot folosi model de încredere (%d) - presupun model de încredere %s\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "folosesc model de încredere %s\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "următoarea verificare trustdb programată pe %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 #| msgid "no need for a trustdb check with `%s' trust model\n"
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "nu e nevoie de o verificare trustdb cu modelul de încredere `%s'\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 #| msgid "no need for a trustdb update with `%s' trust model\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "nu e nevoie de o actualizare trustdb cu modelul de încredere `%s'\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cheia publică %s nu a fost găsită: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "vă rugăm faceţi un --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8100,7 +8251,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:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8108,46 +8259,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am găsit nici o cheie cu încredere supremă\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, 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:2290
+#: g10/trustdb.c:2333
 #, 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ă"
 
@@ -8159,43 +8310,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ă]"
 
@@ -8243,35 +8394,35 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 #, 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:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 #, 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
@@ -8339,7 +8490,7 @@ msgstr "am eşuat să stochez amprenta: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "am eşuat să stochez data creării: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea stării CHV de pe card\n"
@@ -8404,7 +8555,7 @@ msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimă este %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a eÅŸuat: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "cardul este încuiat permanent!\n"
@@ -8554,14 +8705,14 @@ msgstr "semnătură %s, algoritm rezumat %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "semnături create până acum: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, 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:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -8579,81 +8730,87 @@ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 msgid "|N|Initial New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NUME|foloseÅŸte NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NUME|foloseÅŸte NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nu folosi deloc terminalul"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:179
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "arată comenzi administrare"
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
-msgstr ""
-
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8712,7 +8869,7 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8878,7 +9035,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -8932,7 +9089,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -8943,7 +9100,7 @@ msgstr "neforţat(ă)"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 #, fuzzy
 msgid "none"
 msgstr "nu"
@@ -8980,42 +9137,37 @@ msgstr ""
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creată %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, fuzzy, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
@@ -9212,6 +9364,11 @@ msgstr "Creaţi un certificat de revocare desemnat pentru această cheie? (d/N)
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "eroare la crearea frazei-parolă: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9291,135 +9448,135 @@ msgstr "stergere keyblock a eÅŸuat: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Nici o descriere dată)\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 #, fuzzy
 msgid "list external keys"
 msgstr "enumeră chei secrete"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "import certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 #, fuzzy
 msgid "export certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 #, fuzzy
 msgid "register a smartcard"
 msgstr "adaugă o cheie la un smartcard"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:258
-#, fuzzy
-msgid "create base-64 encoded output"
-msgstr "crează ieşire în armură ascii"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "nu folosi deloc terminalul"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr ""
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:278
-msgid "never consult a CRL"
-msgstr ""
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "crează ieşire în armură ascii"
 
-#: sm/gpgsm.c:288
-msgid "check validity using OCSP"
-msgstr ""
+#: sm/gpgsm.c:330
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr ""
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "adaugă acest inel de chei la lista inelelor de chei"
 
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:299
-msgid "do not check certificate policies"
+#: sm/gpgsm.c:354
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NUME|foloseşte algoritm cifrare NUME pentru fraza-parolă"
+
+#: sm/gpgsm.c:372
+msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "nu folosi deloc terminalul"
+#: sm/gpgsm.c:380
+msgid "check validity using OCSP"
+msgstr ""
 
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:382
+msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
-#, fuzzy
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NUME|foloseÅŸte algoritm cifrare NUME"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NUME|foloseÅŸte algoritm rezumat mesaj NUME"
+
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "modul batch: nu întreba niciodată"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "presupune da la cele mai multe întrebări"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "presupune nu la cele mai multe întrebări"
 
-#: sm/gpgsm.c:329
+#: sm/gpgsm.c:418
 #, fuzzy
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "adaugă acest inel de chei la lista inelelor de chei"
-
-#: sm/gpgsm.c:332
-#, fuzzy
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-#, 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:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NUME|foloseÅŸte algoritm cifrare NUME"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NUME|foloseÅŸte algoritm rezumat mesaj NUME"
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9430,27 +9587,27 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "operaţiunea implicită depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9510,7 +9667,7 @@ msgstr "rev? probleme la verificare revocării: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr ""
 
@@ -9540,7 +9697,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9585,23 +9742,23 @@ msgstr ""
 msgid "algorithm:"
 msgstr "validitate: %s"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Semnătură bună din \"%s\""
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "                aka \"%s\""
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr "Aceasta va fi o auto-semnătură.\n"
@@ -10407,118 +10564,142 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-#| msgid "Quit without saving? (y/N) "
-msgid "run without asking a user"
-msgstr "Terminaţi fără a salva?  (d/N) "
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#
+#: dirmngr/dirmngr.c:242
+#, fuzzy
+msgid "|URL|use keyserver at URL"
+msgstr "nu am putut interpreta URL-ul serverului de chei\n"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|HOST|foloseşte acest server de chei pentru a căuta chei"
+
+#: dirmngr/dirmngr.c:271
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr ""
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr ""
+
 #
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:285
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
-msgstr ""
-
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr ""
-
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10531,99 +10712,99 @@ msgstr ""
 "@\n"
 "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "folosire: gpg [opţiuni] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "linie prea lungă"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "amprentă invalidă"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, 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:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "neforţat(ă)"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -10820,94 +11001,94 @@ msgstr "verificarea semnăturii create a eşuat: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 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:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, 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:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10917,69 +11098,69 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "semnarea a eÅŸuat: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "semnarea a eÅŸuat: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "stergere keyblock a eÅŸuat: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "stergere keyblock a eÅŸuat: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "stergere keyblock a eÅŸuat: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, 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:2977
+#: dirmngr/server.c:2984
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11025,7 +11206,7 @@ msgstr "preferinţa `%s' duplicată\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 #, fuzzy
 msgid "quiet"
 msgstr "termină"
@@ -11119,311 +11300,158 @@ msgstr "semnarea a eÅŸuat: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr ""
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr ""
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr ""
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-
-#: tools/gpgconf-comp.c:588
-#, fuzzy
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|foloseşte modul frază-parolă N"
-
-#: tools/gpgconf-comp.c:592
-#, fuzzy
-msgid "do not allow the reuse of old passphrases"
-msgstr "eroare la crearea frazei-parolă: %s\n"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-#, fuzzy
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NUME|cifrare pentru NUME"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr ""
-
-#
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-#, fuzzy
-msgid "|URL|use keyserver at URL"
-msgstr "nu am putut interpreta URL-ul serverului de chei\n"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "importă chei de la un server de chei"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-#| msgid "list and check key signatures"
-msgid "include the public key in signatures"
-msgstr "enumeră şi verifică semnăturile cheii"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr ""
-
-#: tools/gpgconf-comp.c:838
-#, fuzzy
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NUME|foloseşte algoritm cifrare NUME pentru fraza-parolă"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr ""
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr ""
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "eroare reţea"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "frază-parolă incorectă"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "cheia publică nu a fost găsită"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "eroare în `%s': %s\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
 msgstr "eroare în `%s': %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "list global configuration file"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 #, fuzzy
 msgid "check global configuration file"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "actualizează baza de date de încredere"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "foloseÅŸte ca fiÅŸier ieÅŸire"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 #, fuzzy
 msgid "Component not found"
 msgstr "cheia publică nu a fost găsită"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Nu sunt permise comenzi administrare\n"
@@ -11439,6 +11467,29 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "%s: eroare scriere înregistrare dir: %s\n"
+
+#, fuzzy
+#~ msgid "use a log file for the server"
+#~ msgstr "caută pentru chei pe un server de chei"
+
+#, fuzzy
+#~| msgid "Quit without saving? (y/N) "
+#~ msgid "run without asking a user"
+#~ msgstr "Terminaţi fără a salva?  (d/N) "
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "importă chei de la un server de chei"
+
+#, fuzzy
+#~| msgid "list and check key signatures"
+#~ msgid "include the public key in signatures"
+#~ msgstr "enumeră şi verifică semnăturile cheii"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "cer cheia %s de la serverul %s %s\n"
 
@@ -11585,10 +11636,6 @@ msgstr ""
 #~ msgstr "nu pot deschide %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "eroare la scrierea inelului de chei `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "eroare la citire `%s': %s\n"
 
@@ -13051,9 +13098,6 @@ msgstr ""
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "nu folosi niciodată un MDC pentru cifrare"
 
-#~ msgid "use the gpg-agent"
-#~ msgstr "foloseÅŸte gpg-agent"
-
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[fişier]|scrie informaţii de stare în fişier"
 
diff --git a/po/ru.gmo b/po/ru.gmo
index 6af681d..6a86084 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 9cfa31a..da021ff 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.2.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+0200\n"
 "PO-Revision-Date: 2021-10-12 08:13+0200\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -139,8 +139,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "не подходит - попробуйте еще раз"
 
@@ -185,62 +185,92 @@ msgstr "�еверный PIN"
 msgid "Bad Passphrase"
 msgstr "�еверна� фраза-пароль"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "ошибка получени� �ерийного номера карты: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Повторите фразу-пароль:"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase to protect the imported object within the "
+#| "GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Введите фразу-пароль дл� защиты импортированных объектов в �и�теме GnuPG."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ключи ssh длиннее %d бит не поддерживают��\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "не могу �оздать '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "не могу открыть '%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "ошибка получени� �ерийного номера карты: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "обнаружена карта, �ерийный номер: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "на карте нет ключа удо�товерени� лично�ти дл� ssh: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "на карте не найдено подход�щего ключа: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "ошибка получени� �пи�ка карт: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -249,24 +279,20 @@ msgstr ""
 "Проце�� ssh запро�ил до�туп к ключу%%0A  %s%%0A  (%s)%%0AВы хотите �то "
 "позволить?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "Позволить"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "Отказать"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Введите фразу-пароль дл� ключа ssh%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Повторите фразу-пароль:"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -275,95 +301,91 @@ msgstr ""
 "Введите фразу-пароль дл� защиты полученного �екретного ключа%%0A   %s%%0A   "
 "%s%%0Aвнутри хранилища ключей агента gpg"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "�бой �оздани� потока из �окета: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "В�тавьте карту � �ерийным номером"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "Удалите текущую карту и в�тавьте карту � �ерийным номером"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "�дмини�тративный PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "Код разблокировки PIN (PUK)"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Код �бро�а"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr "�ажмите кнопку подтверждени� на карте."
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr "Вводите на клавиатуре �читывател�."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Повторите код �бро�а"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "Повторите ввод PUK"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Повторите ввод PIN"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Код �бро�а повторен неверно; попробуйте еще раз"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK повторен неверно; попробуйте еще раз"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN повторен неверно; попробуйте еще раз"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Введите PIN%s%s%s дл� до�тупа к карте"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "ошибка �оздани� временного файла: %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "ошибка запи�и во временный файл: %s\n"
+#: agent/genkey.c:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "ошибка запи�и в %s: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "В�е равно прин�ть"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Вы не ввели фразу-пароль!%0AПу�та� фраза-пароль недопу�тима."
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -372,11 +394,11 @@ msgstr ""
 "Вы не ввели фразу-пароль - �то, как правило, плоха� мы�ль!%0AПодтвердите, "
 "что Вы дей�твительно не хотите защищать �вой ключ."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Да, защита не нужна"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -384,7 +406,7 @@ msgstr[0] "Фраза-пароль не должна быть короче %u �
 msgstr[1] "Фраза-пароль не должна быть короче %u �имволов."
 msgstr[2] "Фраза-пароль не должна быть короче %u �имволов."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -399,160 +421,232 @@ msgstr[2] ""
 "Фраза-пароль должна �одержать по меньшей мере %u цифр или%%0A�пециальных "
 "�имволов."
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Фраза-пароль не должна быть изве�тным выражением и не должна быть �о�тавлена"
 "%%0Aпо определенному образцу."
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Внимание: Вы ввели небезопа�ную фразу-пароль."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Введите фразу-пароль%0Aдл� защиты нового ключа"
 
-#: agent/genkey.c:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Параметры:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+#, fuzzy
+#| msgid "Options useful for debugging"
+msgid "Options used for startup"
+msgstr "Параметры, полезные дл� отладки"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "запу�к в режиме демона (фоновый режим)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "запу�к в режиме �ервера (нефоновый режим)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr "запу�к в подконтрольном режиме"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "подробно"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "�ократить подробно�ти"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "не от�оедин�ть�� от кон�оли"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "вывод команд в �тиле sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "вывод команд в �тиле csh"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|вз�ть параметры из файла FILE"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "не от�оедин�ть�� от кон�оли"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Параметры, управл�ющие выводом диагно�тики"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "и�пользовать файл журнала дл� �ервера"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "подробно"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|и�пользовать программу PGM дл� ввода паролей"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "�ократить подробно�ти"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|и�пользовать программу PGM как демон криптографиче�ких карт"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|�охран�ть журнал режима �ервера в файле FILE"
+
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Параметры, управл�ющие на�тройками"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "не и�пользовать демон криптографиче�ких карт"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|и�пользовать программу PGM как демон криптографиче�ких карт"
+
+#: agent/gpg-agent.c:213
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|принимать некоторые команды по NAME"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запро�ы �мены терминала"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запро�ы �мены ди�пле� XWindow"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "включить поддержку ssh"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|ALGO|и�пользовать дл� отображени� отпечатков алгоритм ALGO"
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "включить поддержку putty"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Параметры, управл�ющие безопа�но�тью"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|�бра�ывать запомненный PIN через N �екунд"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|�бра�ывать ключи SSH по и�течении N �екунд"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|у�тановить мак�имальный �рок запоминани� PIN N �екунд"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|у�тановить мак�имальный �рок дей�тви� ключа SSH N �екунд"
+
+#: agent/gpg-agent.c:248
 msgid "do not use the PIN cache when signing"
 msgstr "не и�пользовать запомненный PIN при подпи�ывании"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:250
 msgid "disallow the use of an external password cache"
 msgstr "не позвол�ть пользовать�� внешней пам�тью паролей"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "не позвол�ть клиентам помечать ключи как \"доверенные\""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 msgid "allow presetting passphrase"
 msgstr "разрешить преду�танавливать фразу-пароль"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Параметры, обе�печивающие правила дл� фраз-паролей"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "не позвол�ть обходить правила дл� фраз-паролей"
+
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|у�тановить минимальную длину фразы-парол� равной N"
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|n|требовать дл� новой фразы-парол� не менее N неалфавитных �имволов"
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|провер�ть новую фразу-пароль по файлу образцов FILE"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|�читать фразу-пароль у�таревшей через N дней"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "не разрешать повторное и�пользование �тарых фраз-паролей"
+
+#: agent/gpg-agent.c:281
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the PIN-Entry"
+msgstr "Параметры, управл�ющие безопа�но�тью"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
+msgstr ""
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr ""
 "не позвол�ть вызывающей программе замещать �обой программу ввода парол�"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
-msgstr "разрешить ввод фразы-парол� через Emacs"
+#: agent/gpg-agent.c:287
+#, fuzzy
+#| msgid "do not grab keyboard and mouse"
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr "не захватывать клавиатуру и мышь"
 
-#: agent/gpg-agent.c:258
-msgid "enable ssh support"
-msgstr "включить поддержку ssh"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|и�пользовать программу PGM дл� ввода паролей"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "|ALGO|и�пользовать дл� отображени� отпечатков алгоритм ALGO"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|у�тановить врем� ожидани� ввода парол� N �екунд"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "включить поддержку putty"
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Об ошибках в программе �ообщайте по адре�у <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Вызов: @GPG_AGENT@ [параметры] (-h - под�казка)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -560,135 +654,143 @@ msgstr ""
 "Синтак�и�: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
 "Управление �екретными ключами дл� @GNUPG@\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "запрошен недопу�тимый уровень отладки '%s'\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана недопу�тима� хеш-функци�\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "чтение параметров из '%s'\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Замечание: '%s' не �читает�� параметром\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу �оздать �окет: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "�лишком длинное им� �окета '%s'\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "ошибка получени� разового кода дл� �окета\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "ошибка �в�зывани� �окета � '%s': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "не удало�ь задать права до�тупа дл� '%s': %s\n"
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "�лушаем �окет '%s'\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "не могу �оздать каталог '%s': %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "�оздан каталог '%s'\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "�бой stat() дл� '%s': %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "невозможно и�пользовать '%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "ошибка чтени� разового кода из файлового де�криптора %d: %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "обработчик 0x%lx дл� файлового де�криптора %d запущен\n"
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "обработчик 0x%lx дл� файлового де�криптора %d завершил��\n"
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "обработчик ssh 0x%lx дл� файлового де�криптора %d запущен\n"
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "обработчик ssh 0x%lx дл� файлового де�криптора %d завершил��\n"
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "�бой npth_pselect: %s - жду 1 �екунду\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s о�тановлен\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "в �том �еан�е агент gpg не работает\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Параметры:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "Вызов: gpg-preset-passphrase [параметры] КОД_КЛЮЧ� (-h - под�казка)\n"
@@ -701,8 +803,8 @@ msgstr ""
 "Синтак�и�: gpg-preset-passphrase [параметры] КОД_КЛЮЧ�\n"
 "Работа � буфером паролей\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -710,9 +812,8 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -767,43 +868,43 @@ msgstr "отменено\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запро�а ввода фразы-парол�: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "ошибка открыти� '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "файл '%s', �трока %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "выражение \"%s\" в '%s' игнорирует��, �трока %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "�и�темный �пи�ок довери� '%s' не до�тупен\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "недопу�тимый отпечаток в '%s', �трока %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "недопу�тимый признак ключа в '%s', �трока %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "ошибка чтени� '%s', �трока %d: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "ошибка чтени� �пи�ка доверенных корневых �ертификатов\n"
@@ -816,7 +917,7 @@ msgstr "ошибка чтени� �пи�ка доверенных корнев
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -825,11 +926,11 @@ msgstr ""
 "Дей�твительно аб�олютно верить, что%%0A  \"%s\"%%0Aправильно завер�ет "
 "�ертификаты пользовател�?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Да"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "�ет"
@@ -842,7 +943,7 @@ msgstr "�ет"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -853,21 +954,21 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "Подтверждаю"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "�еверно"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Замечание: Фразу-пароль никогда не мен�ли.%0AПожалуй�та, �мените ее �ейча�."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -875,26 +976,26 @@ msgid ""
 msgstr ""
 "Фраза-пароль не мен�ла�ь%%0A� %.4s-%.2s-%.2s. Пожалуй�та, �мените ее �ейча�."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Сменить фразу-пароль"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "Сменю позже"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Вы дей�твительно хотите удалить ключ � кодом%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "Удалить ключ"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -927,7 +1028,7 @@ msgstr "�бой проверки �озданной подпи�и: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "�екретна� ча�ть ключа недо�тупна\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "алгоритм шифровани� � открытым ключом %d (%s) не поддерживает��\n"
@@ -942,52 +1043,52 @@ msgstr "алгоритм защиты %d (%s) не поддерживает��\
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "хеш-функци� защиты %d (%s) не поддерживает��\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "ошибка при �оздании канала конвейера: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "ошибка при �оздании потока дл� канала конвейера: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "ошибка при дублировании проце��а: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "�бой при ожидании завершени� проце��а %d: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "ошибка выполнени� '%s': возможно, не у�тановлен\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "ошибка выполнени� '%s': �тату� завершени� %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "ошибка выполнени� '%s': прервано\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "�бой при ожидании завершени� проце��а: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "ошибка получени� кода возврата проце��а %d: %s\n"
@@ -1017,12 +1118,12 @@ msgstr "Внимание: небезопа�ный владелец объект
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Внимание: небезопа�ные права до�тупа объекта %s \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ожидаю до�тупа к файлу '%s'\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "�бой при переименовании '%s' в '%s': %s\n"
@@ -1082,22 +1183,22 @@ msgstr "выход за предел безопа�ной пам�ти при р
 msgid "out of core while allocating %lu bytes"
 msgstr "выход за границы при размещении %lu байтов"
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "ошибка выделени� до�таточной пам�ти: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: у�таревший параметр \"%s\" - игнорирует��\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "Внимание: параметр \"%s%s\" у�тарел - он игнорирует��\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "неизве�тный отладочный флаг '%s' игнорирует��\n"
@@ -1397,7 +1498,7 @@ msgstr "недопу�тимый параметр"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "не хватает аргумента дл� параметра \"%.50s\"\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "недопу�тимый аргумент дл� параметра \"%.50s\"\n"
@@ -1427,17 +1528,17 @@ msgstr "команда \"%.50s\" неоднозначна\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "недопу�тимый параметр \"%.50s\"\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "Замечание: о�новной файл параметров '%s' не обнаружен\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "файл параметров '%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1458,41 +1559,41 @@ msgstr "�бой в iconv_open: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "�бой преобразовани� '%s' в '%s': %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "�бой при �оздании временного файла '%s': %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "ошибка запи�и в '%s': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "удал�ю залипшую блокировку (�озданную проце��ом %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "жду �н�ти� блокировки (заблокировано проце��ом %d%s) %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(мертва� точка?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "блокировка '%s' не выполнена: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "ожидаю �н�ти� блокировки %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "�лишком �тара� вер�и� %s (нужно %s, е�ть %s)\n"
@@ -1719,22 +1820,22 @@ msgstr "недопу�тимое перенаправление HTTP � �ерв
 msgid "server uses an invalid certificate"
 msgstr "на �ервере примен�ет�� непригодный �ертификат"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, c-format
 msgid "Note: %s\n"
 msgstr "Замечание: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недо�тупна: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1750,8 +1851,8 @@ msgstr "Эта команда до�тупна только дл� карт ве
 msgid "Reset Code not or not anymore available\n"
 msgstr "Код �бро�а (больше) не до�тупен\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1761,120 +1862,120 @@ msgstr "Ваш выбор? "
 msgid "[not set]"
 msgstr "[не у�тановлено]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr "Уважаемый"
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr "Уважаема�"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "не требует��"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "требует��"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Ошибка: Допу�тим только про�той тек�т ASCII.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: �ельз� и�пользовать �имвол \"<\".\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопу�тимы.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Фамили� держател� карты: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Им� держател� карты: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Ошибка: Слишком длинное полное им� (предел - %d �имволов).\n"
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "URL дл� получени� открытого ключа: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "ошибка чтени� '%s': %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "ошибка запи�и '%s': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Учетна� запи�ь (им�): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Секретные данные DO:"
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Предпочтительный �зык: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопу�тима� длина �троки предпочтений.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопу�тимые �имволы в �троке предпочтений.\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Привет�твие (M = Уважаемый, F = Уважаема�, пробел - не задано): "
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопу�тимый ответ.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "отпечаток удо�товер�ющего центра: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: недопу�тимый формат отпечатка.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операци� � ключом невозможна: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "�то не карта OpenPGP"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при �читывании информации ключа: %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить �уще�твующий ключ? (y/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1884,97 +1985,97 @@ msgstr ""
 "           Е�ли �оздать ключ не уда�т��, �верьте�ь � документацией\n"
 "           на карту и вы��ните, какие размеры допу�тимы.\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа Вам необходим? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "размер ключей %s должен быть в пределах %u-%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr "Изменение атрибутов ключа на карте:"
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 msgid "Signature key\n"
 msgstr "Ключа дл� подпи�и\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 msgid "Encryption key\n"
 msgstr "Ключа дл� шифровани�\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr "Ключа дл� удо�товерени� лично�ти\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "�еправильный выбор.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "ошибка изменени� атрибута ключа %d: %s\n"
 
-#: g10/card-util.c:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "ошибка при �читывании информации карты: %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Данна� команда �той картой не поддерживает��\n"
 
-#: g10/card-util.c:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Сделать вне карты архивную копию ключа шифровани�? (Y/n) "
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Замечание: ключи уже хран�т�� на карте!\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить �уще�твующие ключи? (y/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1985,165 +2086,165 @@ msgstr ""
 "   PIN = '%s'    �дмин. PIN = '%s'\n"
 "Вам �ледует изменить их командой --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип �оздаваемого ключа:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подпи�и\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифровани�\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ удо�товерени� лично�ти\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где хранить ключ:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "�бой запи�и ключа на карту: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Замечание: �та команда �отрет � карты в�е ключи!\n"
 
-#: g10/card-util.c:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr "Продолжить? (y/N) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Подтвердите �бро� к завод�ким у�тановкам (введите \"yes\") "
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "ошибка при на�тройке KDF: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "выйти из �того меню"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "показать админи�тративные команды"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "показать данную �правку"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "выве�ти в�е до�тупные данные"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "изменить им� держател� карты"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "изменить URL получени� ключа"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "запро�ить ключ по заданному картой URL"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "изменить им� учетной запи�и"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "изменить �зыковые предпочтени�"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr "изменить привет�твие дл� держател� карты"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "�менить отпечаток удо�товер�ющего центра"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "переключить признак 'подпи�ь требует PIN'"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "�оздать новые ключи"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменени� или разблокировки PIN"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN и показать в�е данные"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "разблокировать PIN � помощью кода �бро�а"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr "уничтожить в�е ключи и данные"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr "на�троить KDF дл� проверки по PIN"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 msgid "change the key attribute"
 msgstr "изменить атрибут ключа"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "Команды админи�трировани�\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Команды админи�трировани� разрешены\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "Команды админи�трировани� не разрешены\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�едопу�тима� команда (�пи�ок команд: \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output дл� данной команды не работает\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "не могу открыть '%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2205,8 +2306,8 @@ msgid "subkey"
 msgstr "подключа"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�бой при обновлении: %s\n"
@@ -2246,24 +2347,24 @@ msgstr "не могу и�пользовать �имметричный паке
 msgid "using cipher %s\n"
 msgstr "и�пользует�� �имметричный шифр %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' уже �жат\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "Внимание: файл '%s' пу�т\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм шифровани� '%s' нельз� и�пользовать в режиме %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "хеш-функцию '%s' нельз� и�пользовать в режиме %s\n"
@@ -2286,48 +2387,54 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "Внимание: ключ %s не подходит дл� шифровани� в режиме %s\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "Внимание: �жатие алгоритмом %s (%d) нарушает предпочтени� получател�\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "принудительное и�пользование �имметричного шифра %s (%d) нарушает "
 "предпочтени� получател�\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано дл� пользовател� \"%s\"\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "параметр '%s' нельз� и�пользовать в режиме %s\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "данные зашифрованы алгоритмом %s\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизве�тным алгоритмом %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Внимание: �ообщение было зашифровано �лабым ключом �имметричного шифра.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "проблема обработки зашифрованного пакета\n"
@@ -2514,212 +2621,272 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "и�пользую подключ %s вме�то первичного ключа %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "недопу�тимые значени� дл� параметра \"%s\"\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "�оздать подпи�ь"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "�оздать тек�товую подпи�ь"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "�оздать отделенную подпи�ь"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "шифрование только �имметричным шифром"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "ра�шифровать данные (по умолчанию)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "проверить подпи�ь"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "выве�ти �пи�ок ключей"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "выве�ти �пи�ок ключей и подпи�ей"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "выве�ти и проверить подпи�и ключей"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "выве�ти �пи�ок ключей и их отпечатков"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "выве�ти �пи�ок �екретных ключей"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "�оздать новую пару ключей"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "бы�тро �оздать новую пару ключей"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr "бы�тро добавить новый идентификатор пользовател�"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr "бы�тро отозвать идентификатор пользовател�"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr "бы�тро у�тановить новый �рок дей�тви�"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "�оздание полноценной пары ключей"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "�оздать �ертификат отзыва"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы �екретных ключей"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "бы�тро подпи�ать ключ"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "бы�тро подпи�ать ключ локально"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "quickly revoke a key signature"
 msgstr "бы�тро отозвать подпи�ь � ключа"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "подпи�ать ключ"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "подпи�ать ключ локально"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "подпи�ать или редактировать ключ"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "�менить фразу-пароль"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "�к�портировать ключи"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "�к�портировать ключи на �ервер ключей"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "импортировать ключи � �ервера ключей"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "и�кать ключи на �ервере ключей"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "обновить в�е ключи � �ервера ключей"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "показать �о�то�ние карты"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "�менить PIN карты"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "обновить таблицу довери�"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "выве�ти хеши �ообщений"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "запу�к в режиме �ервера"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|у�тановить правила TOFU дл� ключа"
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|и�пользовать NAME как о�новной �екретный ключ"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|зашифровывать также дл� идентификатора пользовател� NAME"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|у�тановить �инонимы �лектронной почты"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "�трого �ледовать �тандарту OpenPGP"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "не делать никаких изменений"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "�про�ить перед перезапи�ью"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the input"
+msgstr "Параметры, управл�ющие безопа�но�тью"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+#, fuzzy
+#| msgid "Options controlling the diagnostic output"
+msgid "Options controlling the output"
+msgstr "Параметры, управл�ющие выводом диагно�тики"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "вывод в тек�товом формате"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|USER-ID|зашифровать дл� пользовател� USER-ID"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|выводить данные в файл FILE"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|USER-ID|и�пользовать ключ USER-ID дл� подпи�и и ра�шифровки"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "и�пользовать канониче�кий тек�товый режим"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|у�тановить уровень �жати� N (0 - без �жати�)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "и�пользовать канониче�кий тек�товый режим"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+#, fuzzy
+#| msgid "Options controlling the interactivity and enforcement"
+msgid "Options controlling key import and export"
+msgstr "Параметры, управл�ющие интерактивно�тью и принудительными дей�тви�ми"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|FILE|выводить данные в файл FILE"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
+"|MECHANISMS|и�пользовать механизмы MECHANISMS дл� пои�ка ключей по адре�у "
+"�лектронной почты"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "не делать никаких изменений"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "полно�тью запретить до�туп к dirmngr"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "�про�ить перед перезапи�ью"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+#, fuzzy
+#| msgid "Options controlling the configuration"
+msgid "Options controlling key listings"
+msgstr "Параметры, управл�ющие на�тройками"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "�трого �ледовать �тандарту OpenPGP"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "выве�ти �пи�ок �екретных ключей"
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|зашифровать дл� пользовател� USER-ID"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|и�пользовать ключ USER-ID дл� подпи�и и ра�шифровки"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2727,7 +2894,7 @@ msgstr ""
 "@\n"
 "(Полный �пи�ок команд и параметров �м. на �транице man)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2747,11 +2914,11 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Вызов: @GPG@ [параметры] [файлы] (-h - под�казка)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2761,7 +2928,7 @@ msgstr ""
 "Подпи�и и их проверка, шифрование и ра�шифровка\n"
 "Дей�твие по умолчанию зави�ит от входных данных\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2769,95 +2936,95 @@ msgstr ""
 "\n"
 "Поддерживают�� �ледующие алгоритмы:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Хеш-функции: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "�лгоритмы �жати�: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "вызов: %s [параметры] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "не�овме�тимые команды\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "в определении группы '%s' от�ут�твует знак =\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Внимание: небезопа�ный владелец домашнего каталога '%s'\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Внимание: небезопа�ный владелец файла на�троек '%s'\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Внимание: небезопа�ный владелец файла модул� ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Внимание: небезопа�ные права до�тупа к домашнему каталогу '%s'\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Внимание: небезопа�ные права до�тупа к файлу на�троек '%s'\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Внимание: небезопа�ные права до�тупа к файлу модул� ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "Внимание: небезопа�ный владелец каталога, �одержащего домашний каталог '%s'\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "Внимание: небезопа�ный владелец каталога, �одержащего файл на�троек '%s'\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "Внимание: небезопа�ный владелец каталога,\n"
 "          �одержащего модуль ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1660
+#: g10/gpg.c:1686
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "Внимание: небезопа�ные права до�тупа к каталогу,\n"
 "          �одержащему домашний каталог '%s'\n"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2865,461 +3032,461 @@ msgstr ""
 "В�ИМ��ИЕ: небезопа�ные права до�тупа к каталогу,\n"
 "          �одержащему файл на�троек '%s'\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "Внимание: небезопа�ные права до�тупа к каталогу,\n"
 "          �одержащему файл модул� ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "неизве�тный �лемент в файле на�троек '%s'\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "показывать в �пи�ке ключей фотоидентификаторы"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "показывать в �пи�ке ключей �ведени� о назначении ключа"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "показывать в �пи�ке подпи�ей URL правил"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "показывать в �пи�ке подпи�ей в�е замечани�"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "показывать в �пи�ке подпи�ей замечани� �тандарта IETF"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "показывать в �пи�ке подпи�ей пользователь�кие замечани�"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показывать в �пи�ке подпи�ей URL предпочтительных �ерверов ключей"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 "показывать в �пи�ке ключей дей�твительно�ть идентификаторов пользователей"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показывать в �пи�ке ключей отозванные и про�роченные идентификаторы "
 "пользователей"
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать в �пи�ке ключей отозванные и про�роченные подключи"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "показывать в �пи�ке ключей название таблицы ключей"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "показывать в �пи�ке подпи�ей �роки дей�тви�"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "неизве�тные правила TOFU '%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(\"help\" выведет �пи�ок вариантов)\n"
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данна� команда в режиме %s недопу�тима.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Замечание: %s не предназначен дл� нормального применени�!\n"
 
-#: g10/gpg.c:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' - не допу�тимый �рок дей�тви� подпи�и\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" не �вл�ет�� адре�ом �лектронной почты\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "недопу�тимый режим ввода парол� '%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "недопу�тимый и�точник запро�а '%s'\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' - не допу�тима� таблица �имволов\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "не могу интерпретировать URL �ервера ключей\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопу�тимые параметры �ервера ключей\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "недопу�тимые параметры �ервера ключей\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопу�тимые параметры импорта\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "недопу�тимые параметры импорта\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "недопу�тимый параметр фильтра: %s\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопу�тимые параметры �к�порта\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "недопу�тимые параметры �к�порта\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопу�тимые параметры �пи�ка\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "недопу�тимые параметры �пи�ка\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "показать при проверке подпи�и фотоидентификаторы"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "показать при проверке подпи�и URL правил"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "показать при проверке подпи�ей в�е замечани�"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "показать при проверке подпи�ей замечани� �тандарта IETF"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "показать при проверке подпи�ей пользователь�кие замечани�"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "показать при проверке подпи�ей URL предпочтительных �ерверов ключей"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показать при проверке подпи�ей дей�твительно�ть идентификаторов пользователей"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показать при проверке подпи�ей отозванные и про�роченные идентификаторы "
 "пользовател�"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показать при проверке подпи�ей только первичный идентификатор пользовател�"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "проверить подпи�и по данным PKA"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "подн�ть доверие подпи�ей по дей�твительным данным PKA"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопу�тимые параметры проверки\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "недопу�тимые параметры проверки\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запу�ка дл� %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопу�тимый �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "недопу�тимый �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "Внимание: возможно �оздание файла образа пам�ти!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Внимание: %s отмен�ет %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s � %s недопу�тимо!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s � %s не имеет �мы�ла!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "Внимание: работаем � фальшивым �и�темным временем: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "отказываю�ь работать � небезопа�ной пам�тью из-за %s\n"
 
-#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран недопу�тимый алгоритм шифровани�\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран недопу�тимый алгоритм �жати�\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана недопу�тима� хеш-функци� дл� �ертификации\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопу�тимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Замечание: про�той режим S2K (0) �трого противопоказан\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопу�тимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "недопу�тимые предпочтени� по умолчанию\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "недопу�тимые личные предпочтени� шифра\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "недопу�тимые личные предпочтени� хеш-функции\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "недопу�тимые личные предпочтени� алгоритмов �жати�\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает �овме�тно � %s!\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм �жати� '%s' нельз� и�пользовать в режиме %s\n"
 
-#: g10/gpg.c:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�бой инициализации таблицы довери�: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "В�ИМ��ИЕ: получатели (-r) заданы без и�пользовани� шифровани� � открытым "
 "ключом\n"
 
-#: g10/gpg.c:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "�бой �имметричного шифровани� '%s': %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt нельз� и�пользовать �овме�тно � --s2k-mode 0\n"
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "в режиме %s нельз� и�пользовать --symmetric --encrypt\n"
 
-#: g10/gpg.c:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "в режиме %s нельз� и�пользовать --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�бой при отправке на �ервер ключей: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�бой при получении � �ервера ключей: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "�бой при �к�порте ключа: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "�бой при �к�порте в виде ключа ssh: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�бой при пои�ке на �ервере ключей: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�бой при обновлении � �ервера ключей: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразовани� из тек�тового формата: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразовани� в тек�товый формат: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "недопу�тима� хеш-функци� '%s'\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "ошибка �интак�иче�кого анализа �пецификации ключа '%s': %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "'%s' не �вл�ет�� идентификатором, отпечатком или кодом ключа\n"
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "Внимание: команда не отдана. Пытаю�ь угадать, что имело�ь в виду ...\n"
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Пишите �ообщение ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL правил �ертификации неверен\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL правил подпи�и неверен\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочтительного �ервера ключей неверен\n"
@@ -3332,7 +3499,7 @@ msgstr "|FILE|вз�ть ключи из файла таблицы ключей
 msgid "make timestamp conflicts only a warning"
 msgstr "при не�оответ�твии метки времени - только предупреждение"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить информацию в файл � де�криптором FD"
 
@@ -4042,7 +4209,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы в�е равно хотите его подпи�ать? (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  �е могу подпи�ать.\n"
 
@@ -4215,8 +4382,8 @@ msgstr "Этот ключ проверен мной очень тщательнÐ
 msgid "Really sign? (y/N) "
 msgstr "Дей�твительно подпи�ать? (y/N) "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "подпи�ать не удало�ь: %s\n"
@@ -4414,7 +4581,7 @@ msgstr ""
 "  't' (подпи�и довери�, tsign), 'nr' (неотзываемые, \n"
 "  nrsign) или любое их �очетание (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
@@ -4465,7 +4632,7 @@ msgstr "ДейÑ�твительно удалить Ñ�тот идентификаÑ
 msgid "Really move the primary key? (y/N) "
 msgstr "Дей�твительно переме�тить первичный ключ? (y/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хот� бы один ключ.\n"
 
@@ -4544,133 +4711,133 @@ msgstr "Сохранить изменени�? (y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без �охранени�? (y/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не измен�л�� - обновление не нужно.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "нельз� удал�ть по�ледний дей�твительный идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:2476
+#: g10/keyedit.c:2532
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "�бой отзыва идентификатора пользовател�: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "�бой у�тановки первичного идентификатора пользовател�: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" - не отпечаток\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" - не первичный отпечаток\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "�едопу�тимый идентификатор пользовател� '%s': %s\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "�ет подход�щих идентификаторов пользователей."
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "Подпи�ывать нечего.\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Вами не подпи�ано.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "�бой отзыва подпи�и � ключа подпи�и: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' - не допу�тимый �рок дей�тви�\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" - не правильный отпечаток\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "подключ \"%s\" не найден\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Хеш: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Характери�тики: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "�е измен�ть на �ервере"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Предпочтительный �ервер ключей: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Замечани�: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "В идентификаторе пользовател� типа PGP 2.x не может быть предпочтений.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Следующий ключ был отозван %s пользователем %s ключом %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван пользователем %s ключом %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(о�обо важный)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "     �оздан: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "    отозван: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "про�рочен �: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
@@ -4679,30 +4846,30 @@ msgstr "   годен до: %s"
 # perhaps this should be somewhere in help/man
 # (S - подпи�ь, C - �ертификаци�, E - шифрование, A - удо�товерение лично�ти)
 # too long for repeating messages.
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "назначение: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "номер карты: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "до�товерно�ть: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4710,18 +4877,18 @@ msgstr ""
 "Учтите, что показанна� до�товерно�ть ключа может быть неверной,\n"
 "пока Вы не перезапу�тите программу.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "про�рочен"
 
 # check it
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4731,17 +4898,17 @@ msgstr ""
 "          Эта команда может приве�ти к тому, что первичным �танет �читать��\n"
 "          другой идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "Внимание: Срок дей�тви� Вашего подключа дл� шифровани� и�текает.\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Возможно, надо помен�ть также �рок дей�тви�.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4750,35 +4917,35 @@ msgstr ""
 "Внимание: Это ключ типа PGP2. Добавление фотоидентификатора может\n"
 "          в некоторых вер�и�х PGP вызвать отбраковку ключа.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить �то? (y/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "�ельз� добавить фотоидентификатор в ключ типа PGP2.\n"
 
-#: g10/keyedit.c:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Такой идентификатор пользовател� на �том ключе уже е�ть!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную дей�твительную подпи�ь? (y/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недей�твительную подпи�ь? (y/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизве�тную подпи�ь? (y/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Дей�твительно удалить данную �амоподпи�ь? (y/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4786,20 +4953,20 @@ msgstr[0] "Удалена %d подпи�ь.\n"
 msgstr[1] "Удалены %d подпи�и.\n"
 msgstr[2] "Удалено %d подпи�ей.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "�ичего не удалено.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "недопу�тим"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Идентификатор пользовател� \"%s\" �жат: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4807,17 +4974,17 @@ msgstr[0] "Идентификатор пользовател� \"%s\": %d под
 msgstr[1] "Идентификатор пользовател� \"%s\": %d подпи�и удалены\n"
 msgstr[2] "Идентификатор пользовател� \"%s\": %d подпи�ей удалено\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Идентификатор пользовател� \"%s\" уже минимизирован\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Идентификатор пользовател� \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4826,39 +4993,39 @@ msgstr ""
 "Внимание: Это ключ типа PGP 2.x. Добавление о�обого отзывающего ключа\n"
 "          может в некоторых вер�и�х PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "�ельз� добавить о�обый отзывающий ключ в ключ типа PGP 2.x.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите идентификатор пользовател� ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельз� назначить отзывающим ключ типа PGP 2.x\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим �амого �еб�\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "�тот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "Внимание: назначение ключа отзывающим невозможно отменить!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4866,173 +5033,173 @@ msgstr ""
 "Вы уверены, что хотите изменить �рок дей�тви� �разу не�кольких подключей? (y/"
 "N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена �рока дей�тви� подключа.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена �рока дей�тви� первичного ключа.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "�ельз� изменить �рок дей�тви� ключа v3\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 msgid "Changing usage of a subkey.\n"
 msgstr "Смена режимов и�пользовани� подключа.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 msgid "Changing usage of the primary key.\n"
 msgstr "Смена режимов и�пользовани� первичного ключа.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "подпи�ывающий подключ %s уже перекре�тно заверен\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "подключ %s не дл� подпи�ей, он не нуждает�� в перекре�тном заверении\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите ровно один идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропу�к �амоподпи�и v3 на идентификаторе пользовател� \"%s\"\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтительного �ервера ключей: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы дей�твительно хотите заменить его? (y/N) "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы дей�твительно хотите удалить его? (y/N) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Введите замечание: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Продолжить? (y/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "�ет идентификатора пользовател� � индек�ом %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "�ет идентификатора пользовател� � хешем %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "�ет подключа � идентификатором ключа '%s'.\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "�ет подключа � индек�ом %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Идентификатор пользовател�: \"%s\"\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подпи�ано Вашим ключом %s %s%s%s\n"
 
-#: g10/keyedit.c:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (не�к�портируема�)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок дей�тви� подпи�и и�тек %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать �ертификат отзыва дл� данной подпи�и? (y/N) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подпи�али �ти идентификаторы пользователей на ключе %s:\n"
 
-#: g10/keyedit.c:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (неотзываема�)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отозвано Вашим ключом %s %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете �ледующие подпи�и:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Дей�твительно �оздать �ертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "нет �екретного ключа\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "попытка отзыва непользователь�кого идентификатора: %s\n"
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Идентификатор пользовател� \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "Внимание: подпи�ь идентификатора пользовател� датирована %d �екундами в "
 "будущем\n"
 
-#: g10/keyedit.c:6314
+#: g10/keyedit.c:6370
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "�ельз� удал�ть по�ледний дей�твительный идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5495,7 +5662,7 @@ msgstr ""
 "�нтропии.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при �оздании ключа: %s\n"
@@ -5565,11 +5732,11 @@ msgstr "нет доÑ�тупной длÑ� запиÑ�и таблицы открыÑ
 msgid "error writing public keyring '%s': %s\n"
 msgstr "ошибка запи�и таблицы открытых ключей '%s': %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и �екретный ключи �озданы и подпи�аны.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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"
@@ -5577,7 +5744,7 @@ msgstr ""
 "Учтите, что данный ключ не может и�пользовать�� дл� шифровани�. Можно\n"
 "во�пользовать�� командой \"--edit-key\" и �оздать подключ дл� �тих целей.\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5585,7 +5752,7 @@ msgstr ""
 "ключ �оздан на %lu �екунду в будущем (петл� во времени или проблемы � "
 "ча�ами)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5593,22 +5760,22 @@ msgstr ""
 "ключ �оздан на %lu �екунд в будущем (петл� во времени или проблемы � "
 "ча�ами)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Замечание: �оздание подключей дл� ключей v3 не �овме�тимо � OpenPGP\n"
 
-#: g10/keygen.c:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретные ча�ти первичного ключа от�ут�твуют.\n"
 
-#: g10/keygen.c:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретные ча�ти первичного ключа хран�т�� на карте.\n"
 
-#: g10/keygen.c:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Дей�твительно �оздать? (y/N) "
 
@@ -5823,82 +5990,82 @@ msgstr "запро� ключа из '%s'\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Внимание: невозможно получить URI %s: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�транный размер зашифрованного �еан�ового ключа (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "�еан�овый ключ зашифрован по %s\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "фраза-пароль �оздана � незнакомой хеш-функцией %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ - %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: хороший DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s � идентификатором %s, �озданным %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s � идентификатором %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "�бой ра�шифровки � открытым ключом: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "Внимание: наблюдает�� не�колько тек�тов\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано %lu фразами-парол�ми\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано одной фразой-паролем\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "предполагают�� данные, зашифрованные по %s\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недо�тупен, попробую вме�то него %s\n"
 
-#: g10/mainproc.c:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "Внимание: цело�тно�ть �ообщени� не защищена\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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"
@@ -5908,179 +6075,179 @@ msgstr ""
 "оно правомерно, по�кольку в те времена защита цело�тно�ти широко\n"
 "не примен�ла�ь.\n"
 
-#: g10/mainproc.c:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Во�пользуйте�ь параметром '%s', чтобы тем не менее ра�шифровать.\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "принудительный �бой ра�шифровки!\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "ра�шифровано нормально\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Внимание: зашифрованное �ообщение было изменено!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "�бой ра�шифровки: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Замечание: отправитель запро�ил \"только между нами\"\n"
 
-#: g10/mainproc.c:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "первоначальное им� файла='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "отдельный �ертификат отзыва: задей�твует�� командой \"gpg --import\"\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "подпи�ь не найдена\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХ�Я подпи�ь пользовател� \"%s\""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Про�роченна� подпи�ь пользовател� \"%s\""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Дей�твительна� подпи�ь пользовател� \"%s\""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "проверка подпи�и подавлена\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать �ти неоднозначные данные подпи�и\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпи�ь �делана %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s � идентификатором %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпи�ь �делана %s ключом %s � идентификатором %s\n"
 
-#: g10/mainproc.c:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                издатель \"%s\"\n"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Ключ до�тупен на: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Замечание: Параметр '%s' включает и�пользование �той информации\n"
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[�омнительно]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                или \"%s\""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "Внимание: Данный ключ не подходит дл� подпи�и в режиме %s\n"
 
-#: g10/mainproc.c:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпи�ь про�рочена %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпи�ь дей�твительна до %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "формат подпи�и: %s, хеш-функци� %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "тек�товый"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "неизве�тно"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ", алгоритм ключа "
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "Внимание: не отделенна� подпи�ь; файл '%s' �Е был проверен!\n"
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�е могу проверить подпи�ь: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "не отделенна� подпи�ь\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "Внимание: обнаружено не�колько подпи�ей. Проверена будет только перва�.\n"
 
-#: g10/mainproc.c:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "отдельна� подпи�ь кла��а 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "подпи�ь �тарого типа (PGP 2.x)\n"
@@ -6149,68 +6316,68 @@ msgstr "(�ообщенна� ошибка: %s <%s>)\n"
 msgid "(further info: "
 msgstr "(дальнейшие �ведени�: "
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: параметр \"%s\" не рекомендует��\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "Внимание: параметр \"%s\" не рекомендует��\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "и�пользуйте вме�то �того \"%s%s\"\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "Внимание: команда \"%s\" не рекомендует�� к употреблению - не примен�йте ее\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: \"%s\" в �том файле у�тарело - оно дей�твует только в %s\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "Внимание: параметр \"%s%s\" у�тарел - он дей�твует только дл� %s\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Без �жати�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "без �жати�|без|none"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное �ообщение может быть непригодно дл� %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "неоднозначный параметр '%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "неизве�тный параметр '%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "Открытый ключ ECDSA бывает в кодировке SEC, кратной 8 битам\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "неизве�тный �лабый хеш '%s'\n"
@@ -6243,24 +6410,24 @@ msgstr "вывод в stdout\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "предполагает��, что подпи�анные данные наход�т�� в '%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "не могу и�пользовать алгоритм � открытым ключом %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "Внимание: потенциально небезопа�ный �еан�овый ключ,\n"
 "          зашифрованный �имметричным шифром\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "�еизве�тное критиче�кое замечание к подпи�и: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "в подпакете типа %d у�тановлен критиче�кий бит\n"
@@ -6669,12 +6836,12 @@ msgstr "неизве�тный получатель по умолчанию \"%s
 msgid "no valid addressees\n"
 msgstr "нет пригодных адре�ов\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Замечание: у ключа %s нет функции %s\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Замечание: у ключа %s нет предпочтени� дл� %s\n"
@@ -7114,7 +7281,7 @@ msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "�то ключ Elgamal, �озданный PGP, он не обе�печивает безопа�но�ть подпи�и!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "запи�ь о доверии %lu, тип %d: ошибка запи�и: %s\n"
@@ -7159,7 +7326,7 @@ msgstr "ошибка при пои�ке запи�и о доверии в '%s':
 msgid "read error in '%s': %s\n"
 msgstr "ошибка чтени� в '%s': %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "таблица довери�: �бой �инхронизации: %s\n"
@@ -7705,93 +7872,93 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' не �вл�ет�� допу�тимым длинным идентификатором ключа\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "ключ %s: прин�т как доверенный ключ\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "ключ %s в�тречает�� в таблице довери� более одного раза\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "ключ %s: нет открытого ключа дл� доверенного ключа - пропущен\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "ключ %s помечен как аб�олютно доверенный\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "запи�ь о доверии %lu, тип запро�а %d: �бой чтени�: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "тип запи�и о доверии %lu отличает�� от запрошенного (%d)\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "Можно попытать�� пере�оздать таблицу довери� командами:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Е�ли �то не выйдет, обратите�ь к руковод�тву пользовател�\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "не могу и�пользовать неизве�тную модель (%d) - и�пользую модель довери� %s\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "и�пользую модель довери� %s\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "проверка таблицы довери� не нужна\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�рок �ледующей проверки таблицы довери� %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "провер�ть таблицу довери� при модели довери� '%s' не нужно\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "обновл�ть таблицу довери� при модели довери� '%s' не нужно\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "открытый ключ %s не найден: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуй�та\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы довери�\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -7799,7 +7966,7 @@ msgstr[0] "обработан %d ключ"
 msgstr[1] "обработаны %d ключа"
 msgstr[2] "обработано %d ключей"
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -7807,17 +7974,17 @@ msgstr[0] " (�брошен %d �четчик до�товерно�ти)\n"
 msgstr[1] " (�брошены %d �четчика до�товерно�ти)\n"
 msgstr[2] " (�брошено %d �четчиков до�товерно�ти)\n"
 
-#: g10/trustdb.c:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "аб�олютно доверенных ключей не найдено\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ дл� аб�олютно доверенного ключа %s не найден\n"
 
-#: g10/trustdb.c:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7825,29 +7992,29 @@ msgstr ""
 "глубина: %d  до�товерных: %3d  подпи�анных: %3d  доверие: %d-, %dq, %dn, "
 "%dm, %df, %du\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 "аб�олютное"
 
@@ -7859,39 +8026,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 "[  аб�олютно ]"
 
@@ -7939,33 +8106,33 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%s�омер: %s%%0AДержатель: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "О�тало�ь попыток: %d"
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Введите админи�тративный PIN"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Введите код разблокировки PIN (PUK) дл� �тандартных ключей."
 
-#: scd/app-p15.c:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "|A|Введите PIN дл� �тандартных ключей."
 
@@ -8034,7 +8201,7 @@ msgstr "�бой при �охранении отпечатка: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "�бой при �охранении даты �оздани�: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получени� �тату�а CHV � карты\n"
@@ -8099,7 +8266,7 @@ msgstr "PIN длÑ� CHV%d Ñ�лишком короток, минимальнаÑ� Ð
 msgid "verify CHV%d failed: %s\n"
 msgstr "�бой при проверке CHV%d: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "карта окончательно заблокирована!\n"
@@ -8245,14 +8412,14 @@ msgstr "карта не поддерживает хеш-функцию %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "�оздано подпи�ей: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка админи�тративного PIN в данный момент запрещена �той командой\n"
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет до�тупа к %s - непригодна� карта OpenPGP?\n"
@@ -8268,55 +8435,55 @@ msgstr "||Введите PIN на клавиатуре �читывател�"
 msgid "|N|Initial New PIN"
 msgstr "|N|Первоначальный новый PIN"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "работать в много�ерверном режиме (нефоновый режим)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|у�тановить уровень отладки, равный LEVEL"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|�охран�ть журнал в файл FILE"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|подключать�� к �читывателю на порту N"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|и�пользовать NAME как драйвер ct-API"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|и�пользовать NAME как драйвер PC/SC"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "не и�пользовать внутренний драйвер CCID"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|отключить карту по�ле N �екунд неактивно�ти"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "не и�пользовать клавиатуру �читывател�"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "не позвол�ть и�пользовать админи�тративные команды карты"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "и�пользовать входные данные переменой длины дл� клавиатуры �читывател�"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "не позвол�ть и�пользовать админи�тративные команды карты"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Вызов: @SCDAEMON@ [параметры] (-h - под�казка)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8324,22 +8491,28 @@ msgstr ""
 "Синтак�и�: scdaemon [параметры] [команда [аргументы]]\n"
 "Демон криптографиче�ких карт дл� @GNUPG@\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "и�пользуйте параметр '--daemon' дл� запу�ка приложени� в фоновом режиме\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "обработчик fd %d запущен\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d о�тановлен\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "ошибка получени� информации применимо�ти ключа: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8397,7 +8570,7 @@ msgstr "внешний пои�к издател�\n"
 msgid "number of issuers matching: %d\n"
 msgstr "чи�ло �оответ�твующих издателей: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "не могу получить authorityInfoAccess: %s\n"
@@ -8558,7 +8731,7 @@ msgstr "корневой Ñ�ертификат не помечен как довÐ
 msgid "checking the trust list failed: %s\n"
 msgstr "�бой проверки �пи�ка довери�: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "�лишком длинна� цепочка �ертификатов\n"
@@ -8614,7 +8787,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u-битный хеш недопу�тим дл� %u-битного ключа %s\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8625,7 +8798,7 @@ msgstr "нехватка выделенной пам�ти\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(�то алгоритм MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "нет"
 
@@ -8659,42 +8832,37 @@ msgstr ""
 "S/N %s, идентификатор 0x%08lX,\n"
 "�оздан %s, и�текает %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "не задана применимо�ть ключа - подразумеваем в�е\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "ошибка получени� информации применимо�ти ключа: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "�ертификат не �ледовало и�пользовать дл� заверени�\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "�ертификат не �ледовало и�пользовать дл� подпи�ывани� ответа OCSP\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "�ертификат не �ледовало и�пользовать дл� шифровани�\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "�ертификат не �ледовало и�пользовать дл� подпи�ей\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "�ертификат не пригоден дл� шифровани�\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "�ертификат не пригоден дл� подпи�и\n"
@@ -8882,6 +9050,11 @@ msgstr "Создать �амозаверенный �ертификат? (y/N)
 msgid "These parameters are used:\n"
 msgstr "И�пользуют�� параметры:\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "ошибка �оздани� временного файла: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "Сейча� �оздает�� �амозаверенный �ертификат."
@@ -8958,123 +9131,123 @@ msgstr "�бой при удалении �ертификата \"%s\": %s\n"
 msgid "no valid recipients given\n"
 msgstr "не заданы получатели\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "выве�ти �пи�ок внешних ключей"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "выве�ти �пи�ок цепочек �ертификатов"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "импорт �ертификатов"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "�к�порт �ертификатов"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "зареги�трировать криптографиче�кую карту"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "передать команду dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "вызываем gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "вывод в кодировке base64"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "не и�пользовать терминал �ов�ем"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|чи�ло включаемых �ертификатов"
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|вз�ть информацию о правилах из файла FILE"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "предполагаю, что входные данные в формате PEM"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "предполагаю, что входные данные в формате base64"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "предполагаю, что входные данные в двоичном формате"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "вывод в кодировке base64"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|и�пользовать USER-ID как о�новной �екретный ключ"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|добавить таблицу ключей в �пи�ок таблиц ключей"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "запро�ить недо�тающих издателей �ертификатов"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|и�пользовать кодировку NAME дл� фраз-паролей PKCS#12"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "не �вер�ть �о �пи�ком отозванных �ертификатов"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "не провер�ть �пи�ки отозванных �ертификатов дл� корневых �ертификатов"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "проверка до�товерно�ти � помощью OCSP"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|чи�ло включаемых �ертификатов"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|FILE|вз�ть информацию о правилах из файла FILE"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "не провер�ть правила �ертификата"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "запро�ить недо�тающих издателей �ертификатов"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "не и�пользовать терминал �ов�ем"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|FILE|�охран�ть журнал режима �ервера в файле FILE"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|и�пользовать алгоритм шифровани� NAME"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FILE|�охран�ть журнал аудита в файле FILE"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|и�пользовать хеш-функцию NAME"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "пакетный режим: ничего не �прашивать"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "прин�ть 'да' как ответ на большин�тво вопро�ов"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "прин�ть 'нет' как ответ на большин�тво вопро�ов"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FILE|добавить таблицу ключей в �пи�ок таблиц ключей"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|USER-ID|и�пользовать USER-ID как о�новной �екретный ключ"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|и�кать ключи на данном �ервере ключей"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|и�пользовать алгоритм шифровани� NAME"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAME|и�пользовать хеш-функцию NAME"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|�охран�ть журнал аудита в файле FILE"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Вызов: @GPGSM@ [параметры] [файлы] (-h - под�казка)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9084,27 +9257,27 @@ msgstr ""
 "Подпи�ать, проверить, зашифровать или ра�шифровать по протоколу S/MIME\n"
 "Операци� по умолчанию зави�ит от входных данных\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Замечание: не могу зашифровать дл� '%s': %s\n"
 
-#: sm/gpgsm.c:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "неизве�тна� �хема проверки '%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "импорт общих �ертификатов '%s'\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "невозможно подпи�ать � помощью '%s': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "недопу�тима� команда (не�вной команды нет)\n"
@@ -9164,7 +9337,7 @@ msgstr "проблема повторного поиÑ�ка Ñ�ертификатÐ
 msgid "error storing flags: %s\n"
 msgstr "ошибка �охранени� признаков: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Ошибка - "
 
@@ -9202,7 +9375,7 @@ msgstr ""
 "\n"
 "%s%sВы уверены, что хотите �того?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9253,7 +9426,7 @@ msgstr "[дата не указана]"
 msgid "algorithm:"
 msgstr "алгоритм:"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9261,17 +9434,17 @@ msgstr ""
 "недопу�тима� подпи�ь: атрибут хеш-функции �ообщени� не �оответ�твует "
 "вычи�ленному\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Хороша� подпи�ь пользовател�"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "                         или"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Это квалифицированна� подпи�ь\n"
@@ -10078,118 +10251,141 @@ msgstr "нужно аб�олютное им� файла\n"
 msgid "looking up '%s'\n"
 msgstr "пои�к '%s'\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "выве�ти �одержание буфера �пи�ков отозванных �ертификатов"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|загрузить �пи�ок отозванных �ертификатов из файла FILE в буфер"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|получить �пи�ок отозванных �ертификатов из URL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "выключить dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "запи�ать буфер на ди�к"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|FILE|�охран�ть журнал режима �ервера в файле FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr "разрешить проверку вер�ий программ по �ети"
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "работать, не �прашива� пользовател�"
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr "|N|не возвращать более чем N результатов одного пои�ка"
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
-msgstr "принудительна� загрузка у�таревших �пи�ков отозванных �ертификатов"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "разрешить по�ылку запро�ов OCSP"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
+msgstr "проводить ве�ь �етевой обмен через Tor"
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
-msgstr "разрешить проверку вер�ий программ по �ети"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "�а�тройки �ерверов ключей"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|и�пользовать �евер ключей по URL"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+msgstr ""
+"|FILE|и�пользовать �ертификаты удо�товер�ющего центра из файла FILE дл� HKP "
+"по TLS"
+
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr "�а�тройки �ерверов HTTP"
+
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "запретить и�пользование HTTP"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "запретить и�пользование LDAP"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 "игнорировать точки ра�про�транени� �пи�ков отозванных �ертификатов по HTTP"
 
-#: dirmngr/dirmngr.c:205
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
+msgstr "|URL|перенаправл�ть в�е запро�ы HTTP на URL"
+
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "и�пользовать �и�темные на�тройки промежуточного �ервера HTTP"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "�а�тройки �ерверов LDAP"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "запретить и�пользование LDAP"
+
+#: dirmngr/dirmngr.c:263
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 "игнорировать точки ра�про�транени� �пи�ков отозванных �ертификатов по LDAP"
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "игнорировать URL �лужб OCSP из �ертификата"
-
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
-msgstr "|URL|перенаправл�ть в�е запро�ы HTTP на URL"
-
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|и�пользовать хо�т HOST дл� пои�ка LDAP"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "не пользовать�� запа�ными хо�тами � --ldap-proxy"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|и�кать ключи на данном �ервере ключей"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|вз�ть �пи�ок �ерверов LDAP из файла FILE"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "добавл�ть новые �ерверы, обнаруженные в точках ра�про�транени� �пи�ков "
 "отозванных �ертификатов, в �пи�ок �ерверов"
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|у�тановить врем� ожидани� LDAP N �екунд"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "�а�тройки OCSP"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "разрешить по�ылку запро�ов OCSP"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "игнорировать URL �лужб OCSP из �ертификата"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|и�пользовать ответчик OCSP по URL"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|ответ OCSP подпи�ан �ертификатом � отпечатком FPR"
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
-msgstr "|N|не возвращать более чем N результатов одного пои�ка"
-
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr ""
-"|FILE|и�пользовать �ертификаты удо�товер�ющего центра из файла FILE дл� HKP "
-"по TLS"
-
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
-msgstr "проводить ве�ь �етевой обмен через Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "принудительна� загрузка у�таревших �пи�ков отозванных �ертификатов"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10198,11 +10394,11 @@ msgstr ""
 "@\n"
 "(Полный �пи�ок команд и параметров �м. в руковод�тве \"info\")\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Вызов: @DIRMNGR@ [параметры] (-h - под�казка)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10210,83 +10406,83 @@ msgstr ""
 "Синтак�и�: @DIRMNGR@ [параметры] [команда [аргументы]]\n"
 "До�туп к OCSP, �ерверам ключей, �пи�кам отозванных �ертификатов дл� @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "допу�тимые уровни отладки: %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "вызов: %s [параметры] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "двоеточи� в имени �окета недопу�тимы\n"
 
-#: dirmngr/dirmngr.c:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "�бой при получении �пи�ка отозванных �ертификатов из '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "�бой обработки �пи�ка отозванных �ертификатов из '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: �лишком длинна� �трока - пропущена\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: обнаружен неверный отпечаток\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: ошибка чтени�: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: му�ор в конце �троки игнорирует��\n"
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "получен SIGHUP - повторное чтение на�троек и запи�ь буферов на ди�к\n"
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "получен SIGUSR2 - дей�твие не определено\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "получен SIGTERM - завершение работы ...\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "получен SIGTERM - о�тало�ь %d активных �оединений\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "принудительное выключение\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "получен SIGINT - немедленное завершение работы\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "получен �игнал %d - дей�твие не определено\n"
@@ -10476,91 +10672,91 @@ msgstr "�бой получени� хеша ответа OCSP дл� '%s': %s\n
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "не подпи�ано о�новным �ертификатом подпи�ывающего OCSP"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "�бой размещени� �лемента �пи�ка: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "ошибка при получении идентификатора ответчика: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "не найден �ертификат издател�: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "вызывавший не вернул целевой �ертификат\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "вызывавший не вернул издающий �ертификат\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "�бой при выделении пам�ти под контек�т OCSP: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "не определен о�новной ответчик OCSP\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "не определен о�новной подпи�ывающий в OCSP\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "и�пользует�� о�новной ответчик OCSP '%s'\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "и�пользует�� ответчик OCSP '%s'\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "ошибка получени� �тату�а OCSP дл� целевого �ертификата: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "�тату� �ертификата: %s (�тот=%s, �ледующий=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr "хороший"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "�ертификат был отозван %s по причине: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "ответчик OCSP возвратил �тату� в будущем\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "ответчик OCSP возвратил нетекущий �тату�\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "ответчик OCSP возвратил �лишком �тарый �тату�\n"
@@ -10570,67 +10766,67 @@ msgstr "ответчик OCSP возвратил Ñ�лишком Ñ�тарый Ñ�Ñ
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "�бой assuan_inquire(%s): %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "в идентификаторе �ертификата нет �ерийного номера"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "�бой assuan_inquire: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "�бой fetch_cert_by_url: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "ошибка отправки данных: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "�бой start_cert_fetch: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "�бой fetch_next_cert: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "превышено max_replies %d\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "�бой при выделении пам�ти под управл�ющую �труктуру: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "�бой размещени� контек�та Assuan: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "�бой инициализации �ервера: %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "�бой реги�трации команд � помощью Assuan: %s\n"
 
-#: dirmngr/server.c:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "проблема � приемом Assuan: %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "�бой обработки Assuan: %s\n"
@@ -10676,7 +10872,7 @@ msgstr ""
 "�ертификат не �ледовало и�пользовать дл� подпи�ывани� �пи�ка отозванных "
 "�ертификатов\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "менее подробно"
 
@@ -10769,277 +10965,132 @@ msgstr "�бой отправки �троки: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "ошибка отправки �тандартных параметров: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Параметры, управл�ющие выводом диагно�тики"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Параметры, управл�ющие на�тройками"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Параметры, полезные дл� отладки"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Параметры, управл�ющие безопа�но�тью"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|�бра�ывать ключи SSH по и�течении N �екунд"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|у�тановить мак�имальный �рок запоминани� PIN N �екунд"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|у�тановить мак�имальный �рок дей�тви� ключа SSH N �екунд"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Параметры, обе�печивающие правила дл� фраз-паролей"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "не позвол�ть обходить правила дл� фраз-паролей"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|у�тановить минимальную длину фразы-парол� равной N"
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr "|n|требовать дл� новой фразы-парол� не менее N неалфавитных �имволов"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|FILE|провер�ть новую фразу-пароль по файлу образцов FILE"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|�читать фразу-пароль у�таревшей через N дней"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "не разрешать повторное и�пользование �тарых фраз-паролей"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|у�тановить врем� ожидани� ввода парол� N �екунд"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|и�пользовать NAME как о�новной �екретный ключ"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAME|зашифровывать также дл� идентификатора пользовател� NAME"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|у�тановить �инонимы �лектронной почты"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "�а�тройки �ерверов ключей"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL|и�пользовать �евер ключей по URL"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "разрешить пои�к по PKA (запро�ы DNS)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-"|MECHANISMS|и�пользовать механизмы MECHANISMS дл� пои�ка ключей по адре�у "
-"�лектронной почты"
-
-#: tools/gpgconf-comp.c:764
-msgid "import missing key from a signature"
-msgstr "импортировать недо�тающий ключ из подпи�и"
-
-#: tools/gpgconf-comp.c:767
-msgid "include the public key in signatures"
-msgstr "вно�ить открытый ключ в подпи�и"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "полно�тью запретить до�туп к dirmngr"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAME|и�пользовать кодировку NAME дл� фраз-паролей PKCS#12"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "не провер�ть �пи�ки отозванных �ертификатов дл� корневых �ертификатов"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Параметры, управл�ющие форматом вывода"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Параметры, управл�ющие интерактивно�тью и принудительными дей�тви�ми"
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr "Параметры, управл�ющие применением Tor"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "�а�тройки �ерверов HTTP"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "и�пользовать �и�темные на�тройки промежуточного �ервера HTTP"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "�а�тройки �ерверов LDAP"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "Спи�ок �ерверов LDAP"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "�а�тройки OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr "Закрытые ключи"
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr "Криптографиче�кие карты"
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr "Сеть"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr "Ввод фраз-паролей"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "Компонент не подходит дл� запу�ка"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Файл конфигурации компонента %s неи�правен\n"
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Замечание: Подробно�ти можно выве�ти командой \"%s%s\".\n"
 
-#: tools/gpgconf-comp.c:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Внешн�� проверка компонента %s не прошла"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Обратите внимание, что �пецификации групп игнорируют��\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "ошибка закрыти� '%s'\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "ошибка при интерпретации '%s'\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "вывод �пи�ка в�ех компонентов"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "проверить в�е программы"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|вывод �пи�ка параметров"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|изменить параметры"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|проверить параметры"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "применить глобальные значени� по умолчанию"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|обновить файлы конфигурации из файла FILE"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "получить каталоги на�троек дл� @GPGCONF@"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "указать глобальный файл на�троек"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "проверить глобальный файл на�троек"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr "запро�ить базу данных вер�ий программ"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "перезагрузить в�е или заданный компонент"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "запу�тить заданный компонент"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "выключить заданный компонент"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "задей�твовать изменени� во врем� и�полнени�, е�ли возможно"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Вызов: @GPGCONF@ [параметры] (-h - под�казка)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11047,15 +11098,15 @@ msgstr ""
 "Синтак�и�: @GPGCONF@ [параметры]\n"
 "Управл�ет параметрами на�троек ин�трументари� @GNUPG@\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Требует�� однокомпонентный аргумент"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Компонент не найден"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "�ргументы не разрешены"
 
@@ -11071,6 +11122,36 @@ msgstr ""
 "Синтак�и�: gpg-check-pattern [параметры] файл_образцов\n"
 "Проверить фразу-пароль, по�тупающую из stdin, по файлу образцов\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "ошибка запи�и во временный файл: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "и�пользовать файл журнала дл� �ервера"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|FILE|�охран�ть журнал режима �ервера в файле FILE"
+
+#~ msgid "run without asking a user"
+#~ msgstr "работать, не �прашива� пользовател�"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "разрешить пои�к по PKA (запро�ы DNS)"
+
+#~ msgid "import missing key from a signature"
+#~ msgstr "импортировать недо�тающий ключ из подпи�и"
+
+#~ msgid "include the public key in signatures"
+#~ msgstr "вно�ить открытый ключ в подпи�и"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "Параметры, управл�ющие форматом вывода"
+
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Параметры, управл�ющие применением Tor"
+
+#~ msgid "LDAP server list"
+#~ msgstr "Спи�ок �ерверов LDAP"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "запрашиваю ключ %s � �ервера %s %s\n"
 
@@ -11242,9 +11323,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "невозможно открыть %s на запи�ь: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "ошибка запи�и в %s: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "ошибка чтени� из %s: %s\n"
 
@@ -11386,9 +11464,6 @@ msgstr ""
 #~ msgid "listen() failed: %s\n"
 #~ msgstr "�бой listen(): %s\n"
 
-#~ msgid "do not grab keyboard and mouse"
-#~ msgstr "не захватывать клавиатуру и мышь"
-
 #~ msgid "Error: URL too long (limit is %d characters).\n"
 #~ msgstr "Ошибка: Слишком длинный URL (предел - %d �имволов).\n"
 
diff --git a/po/sk.po b/po/sk.po
index 5b11443..2583f11 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -136,8 +136,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "nesprávne heslo"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr ""
 
@@ -187,13 +187,47 @@ msgstr "nesprávne MPI"
 msgid "Bad Passphrase"
 msgstr "nesprávne heslo"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, fuzzy, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "chyba pri vytváraní hesla: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+#, fuzzy
+msgid "Please re-enter this passphrase"
+msgstr "zmeniť heslo"
+
+#: agent/command.c:2423
+#, 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:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochranný algoritmus %d%s nie je podporováný\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -201,189 +235,172 @@ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
 msgid "can't create '%s': %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "nemôžem otvoriť `%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, fuzzy, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "chyba pri vytváraní hesla: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "chyba pri zápise do súboru tajných kľú�ov `%s': %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nenájdený zapisovateľný súbor tajných kľú�ov (secring): %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-#, fuzzy
-msgid "Please re-enter this passphrase"
-msgstr "zmeniť heslo"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Opakujte heslo: "
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Opakujte heslo: "
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Opakujte heslo: "
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "heslo nie je zopakované správne; skúste to znovu"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "heslo nie je zopakované správne; skúste to znovu"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakované správne; skúste to znovu"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "chyba pri vytváraní hesla: %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "zapisujem do '%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "chyba pri zápise súboru kľú�ov (keyring)  `%s': %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Vložiť heslo\n"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Použiť napriek tomu tento kľú�? "
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, 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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -391,7 +408,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:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -399,166 +416,233 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-#, fuzzy
-msgid ""
-"@Options:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
 msgstr ""
-"@\n"
-"Možnosti:\n"
-" "
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Kľú� je nahradený"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "s dodato�nými informáciami"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "byť o trochu tichší"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:192
-#, fuzzy
-msgid "use a log file for the server"
-msgstr "vyhľadať kľú�e na serveri kľú�ov"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "s dodato�nými informáciami"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "byť o trochu tichší"
+
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizovať databázu dôvery"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr ""
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "nepodporované"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "nepodporované"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr ""
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr ""
+
 #: agent/gpg-agent.c:244
-msgid "do not use the PIN cache when signing"
+msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
 #: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:248
+msgid "do not use the PIN cache when signing"
+msgstr ""
+
+#: agent/gpg-agent.c:250
 #, 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:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr ""
+
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr ""
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:258
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr ""
+
+#: agent/gpg-agent.c:276
 #, fuzzy
-#| msgid "not supported"
-msgid "enable ssh support"
-msgstr "nepodporované"
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|použiť mód hesla N"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:278
+#, fuzzy
+msgid "do not allow the reuse of old passphrases"
+msgstr "chyba pri vytváraní hesla: %s\n"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:283
 #, fuzzy
-#| msgid "not supported"
-msgid "enable putty support"
-msgstr "nepodporované"
+#| msgid "use the gpg-agent"
+msgid "never use the PIN-entry"
+msgstr "použite gpg-agenta"
+
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr ""
+
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr ""
+
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr ""
+
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -566,149 +650,159 @@ 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:551
+#: agent/gpg-agent.c:572
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: adresár vytvorený\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, 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:2374
+#: agent/gpg-agent.c:2356
 #, 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:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, 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:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�ené: %s\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+#, fuzzy
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@\n"
+"Možnosti:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 #, fuzzy
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -720,8 +814,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -729,9 +823,8 @@ msgstr ""
 "@Príkazy:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -785,43 +878,43 @@ msgstr "Zrušiť"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "chyba pri �ítaní: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "tajné �asti kľú�a nie sú dostupné\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "chyba pri �ítaní: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -834,19 +927,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -859,7 +952,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -869,48 +962,48 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 #, fuzzy
 msgid "Change passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Skuto�ne chcete zmazať vybrané kľú�e? "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 msgid "Delete key"
 msgstr "nastaviť kľú� ako platný (enable)"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -941,7 +1034,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -959,52 +1052,52 @@ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "ochranný algoritmus %d%s nie je podporováný\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 msgid "error running '%s': terminated\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba pri zápise do súboru tajných kľú�ov `%s': %s\n"
@@ -1035,12 +1128,12 @@ msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpe�ne \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpe�ne \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
@@ -1101,22 +1194,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "chyba pri vytváraní súboru kľú�ov (keyring)`%s': %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROV�N�: použitie parametra \"%s\" sa neodporú�a\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1456,7 +1549,7 @@ msgstr "neplatný parameter pre import\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "neplatný parameter pre import\n"
@@ -1486,19 +1579,19 @@ msgstr ""
 msgid "invalid option \"%.50s\"\n"
 msgstr "neplatný parameter pre import\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "POZN�MKA: neexistuje implicitný súbor s možnosťami `%s'\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "súbor s možnosťami `%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1518,41 +1611,41 @@ msgstr "nemožno otvoriť súbor: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "chyba pri zápise súboru kľú�ov (keyring)  `%s': %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr ""
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "verejný kľú� %08lX nebol nájdený: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1794,23 +1887,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "vytvoriť revoka�ný certifikát"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, 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:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
@@ -1826,8 +1919,8 @@ msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1837,230 +1930,230 @@ msgstr "Váš výber? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 #, fuzzy
 msgid "not forced"
 msgstr "nespracované"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "žiadny zodpovedajúci verejný kľú�: %s\n"
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "chyba pri zápise súboru kľú�ov (keyring)  `%s': %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizovať predvoľby"
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatný znak v reťazci s predvoľbami\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatný znak v reťazci s predvoľbami\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vypísať fingerprint"
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie kľú�a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Akú veľkosť kľú�a si prajete? (1024) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrúhlené na %u bitov\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosím, vyberte druh kľú�a, ktorý chcete:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Neplatný výber.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, 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:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2068,184 +2161,184 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 #, 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:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 #, 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:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Skuto�ne podpísať? "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "ukon�iť toto menu"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "ukázať túto pomoc"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 #, fuzzy
 msgid "list all available data"
 msgstr "Kľú� k dispozícii na: "
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeniť dobu platnosti"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeniť dôveryhodnosť vlastníka kľú�a"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vypísať fingerprint"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|MENO|použiť MENO ako implicitného adresáta"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "zmeniť dôveryhodnosť vlastníka kľú�a"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný príkaz (skúste \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento príkaz nefunguje\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "nemožno otvoriť `%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2308,8 +2401,8 @@ msgid "subkey"
 msgstr "Verejné kľú�e: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
@@ -2349,26 +2442,26 @@ msgstr "v móde S2K nemožno použiť symetrický ESK paket\n"
 msgid "using cipher %s\n"
 msgstr "použitá šifra %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' je už skomprimovaný\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "VAROVANIE: súbor `%s' je prázdny\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "nemôžete použiť hashovací algoritmus \"%s\" v móde %s\n"
@@ -2390,7 +2483,13 @@ msgstr "vyžiadaná symetrická šifra %s (%d) nevyhovuje predvoľbám príjemcu
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROV�N�: použitie parametra \"%s\" sa neodporú�a\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2398,17 +2497,17 @@ msgid ""
 msgstr ""
 "vyžiadaný kompresný algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vyžiadaná symetrická šifra %s (%d) nevyhovuje predvoľbám príjemcu\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zašifrovaný pre: %s\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
@@ -2416,24 +2515,24 @@ msgstr ""
 "použitie %s nie je v móde %s dovolené\n"
 "\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s zašifrované dáta\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "zašifrované neznámym algoritmom %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VAROVANIE: správa bola zašifrovaná slabým kľú�om v symetrickej šifre.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problém so zašifrovaným paketom\n"
@@ -2632,239 +2731,290 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "používam sekundárny kľú� %08lX namiesto primárneho kľú�a %08lX\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 #, fuzzy
 msgid "make a signature"
 msgstr "vytvoriť podpis oddelený od dokumentu"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[súbor]|vytvoriť podpis v �itateľnom dokumente"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "vytvoriť podpis oddelený od dokumentu"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "šifrovať dáta"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "Å¡ifrovanie len so symetrickou Å¡ifrou"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "dešifrovať dáta (implicitne)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "verifikovať podpis"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "vypísať zoznam kľú�ov"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "vypísať zoznam kľú�ov a podpisov"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolovať podpisy kľú�ov"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "vypísať zoznam kľú�ov a fingerprintov"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "vypísať zoznam tajných kľú�ov"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "vytvoriť revoka�ný certifikát"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "odstrániť kľú� zo súboru verejných kľú�ov"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "odstrániť kľú� zo súboru tajných kľú�ov"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "podpísať kľú�"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "podpísať kľú� lokálne"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "podpísať kľú�"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "podpísať kľú� lokálne"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "podpísať alebo modifikovať kľú�"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmeniť heslo"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "exportovať kľú�e"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "exportovať kľú�e na server kľú�ov"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importovať kľú�e zo servera kľú�ov"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "vyhľadať kľú�e na serveri kľú�ov"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "aktualizovať všetky kľú�e zo servera kľú�ov"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importovať/zlú�iť kľú�e"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "aktualizovať databázu dôvery"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [súbory]|vypíš hash"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
-msgid "create ascii armored output"
-msgstr "vytvor výstup zakódovaný pomocou ASCII"
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|MENO|použi MENO ako implicitný tajný kľú�"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
+#: g10/gpg.c:596 sm/gpgsm.c:332
 #, fuzzy
-msgid "|USER-ID|encrypt for USER-ID"
+msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|MENO|šifrovať pre MENO"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-#, fuzzy
-msgid "|USER-ID|use USER-ID to sign or decrypt"
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr ""
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "nevykonať žiadne zmeny"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "vyžiadať potvrdenie pred prepísaním"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr ""
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
 msgstr ""
-"použiť toto id užívateľa na podpísanie\n"
-" alebo dešifrovanie"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:709 sm/gpgsm.c:316
+msgid "create ascii armored output"
+msgstr "vytvor výstup zakódovaný pomocou ASCII"
+
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+#, fuzzy
+msgid "|FILE|write output to FILE"
+msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
+
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "použiť kánonický textový mód"
+
+#: g10/gpg.c:743
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|nastaviť úroveň komprimácie N (0 - žiadna\n"
 " komprimácia)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "použiť kánonický textový mód"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr ""
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
+
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr ""
+
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr ""
+
+#: g10/gpg.c:803 sm/gpgsm.c:324
 #, fuzzy
-msgid "|FILE|write output to FILE"
-msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "vypísať zoznam tajných kľú�ov"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "nevykonať žiadne zmeny"
+#: g10/gpg.c:805 sm/gpgsm.c:326
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|MENO|šifrovať pre MENO"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "vyžiadať potvrdenie pred prepísaním"
+#: g10/gpg.c:813 sm/gpgsm.c:328
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr ""
+"použiť toto id užívateľa na podpísanie\n"
+" alebo dešifrovanie"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2873,7 +3023,7 @@ msgstr ""
 "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
 "možností)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2903,13 +3053,13 @@ msgstr ""
 " --list-keys [mená]        vypísať kľú�e\n"
 " --fingerprint [mená]      vypísať fingerprinty\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2924,7 +3074,7 @@ msgstr ""
 "podpísať, overiť, šifrovať alebo dešifrovať\n"
 "implicitné operácie závisia od vstupných dát\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2932,558 +3082,558 @@ msgstr ""
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Verejné kľú�e: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Å ifry: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "použitie: gpg [možnosti] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = podpis nájdený v definícii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, 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:1627
+#: g10/gpg.c:1653
 #, 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:1630
+#: g10/gpg.c:1656
 #, 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:1636
+#: g10/gpg.c:1662
 #, 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:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, 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:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, 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:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, 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:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "neznáma položka konfigurácie \"%s\"\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, 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:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 #, 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:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "ukáž v ktorom súbore kľú�ov je vypísaný kľú�"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 #, 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:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, 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:3218
+#: g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemožno nastaviť exec-path na %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program môže vytvoriť súbor core!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prepíše %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolené používať %s s %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedáva s %s zmysel!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, 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:3839
+#: g10/gpg.c:3837
 #, 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:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatná minimálna úroveň certifikácie; musí byť 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduchý mód S2K (0) je dôrazne nedoporu�ovaný\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatný mód S2K; musí byť 0, 1 alebo 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "neplatné defaultné predvoľby\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné užívateľské predvoľby pre hashovanie\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné užívateľské predvoľby pre kompresiu\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ešte nepracuje s %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo poslať kľú� na server: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prijať kľú� zo servera: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export kľú�a: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, 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:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa nájsť server: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualizácia servera zlyhala: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite písať svoju správu ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pre certifika�nú politiku je neplatné\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
@@ -3497,7 +3647,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapísať informácie o stave do tohto FD"
 
@@ -4210,7 +4360,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si istý, že stále chcete podpísať tento kľú�? (a/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Nemožno podpísať.\n"
 
@@ -4413,8 +4563,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podpísať? "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -4624,7 +4774,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Kľú� revokovaný."
 
@@ -4677,7 +4827,7 @@ msgstr "Skuto�ne odstrániť toto id užívateľa? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstrániť toto id užívateľa? "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybrať aspoň jeden kľú�.\n"
@@ -4764,169 +4914,169 @@ msgstr "Uložiť zmeny? "
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�iť bez uloženia? "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "kľú� nebol zmenený, takže nie je potrebné ho aktualizovať.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Takýto identifikátor užívateľa neexistuje.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Ni� na podpísanie kľú�om %08lX\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   podpísané %08lX v %s%s\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 #, fuzzy
 msgid "Notations: "
 msgstr "Notácie: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Užívateľské ID vo formáte PGP 2.x nemá žiadne predvoľby\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Tento kľú� môže byť revokovaný kľú�om %s "
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento kľú� môže byť revokovaný kľú�om %s "
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citlivá informácia)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokované]"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnosť skon�í: %s]"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnosť skon�í: %s]"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " dôvera: %c/%c"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " dôvera: %c/%c"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Tento kľú� bol ozna�ený za neplatný (disabled)"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4934,19 +5084,19 @@ msgstr ""
 "Prosím nezabúdajte, že zobrazované údaje o platnosti kľú�ov nemusia\n"
 "byť správne, pokiaľ znovu nespustíte program.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "revoked"
 msgstr "[revokované]"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4955,18 +5105,18 @@ msgstr ""
 "VAROVANIE: žiadne ID užívateľa nebolo ozna�ené ako primárne. Tento príkaz\n"
 "spôsobí, že iné ID užívateľa sa bude považovať primárne.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Nemôžete zmeniť dobu platnosti kľú�a verzie 3\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4975,35 +5125,35 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 kľú�. Pridanie fotografického ID môže v niektorých\n"
 "           verziách PGP viesť k odmietnutiu tohto kľú�a.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si istý, že ho chcete stále pridať? (a/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmazať tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmazať tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmazať tento neznámy podpis? (a/N/u)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmazať tento podpis podpísaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5011,38 +5161,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Zmazaný %d podpis.\n"
 msgstr[1] "Zmazaný %d podpis.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznané.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 #, fuzzy
 msgid "invalid"
 msgstr "neplatný spôsob reprezentácie v ASCII"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Užívateľské ID \"%s\" je revokované."
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Užívateľské ID \"%s\" je revokované."
 msgstr[1] "Užívateľské ID \"%s\" je revokované."
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5051,221 +5201,221 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 kľú�. Pridanie fotografického ID môže v niektorých\n"
 "           verziách PGP viesť k odmietnutiu tohoto kľú�a.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nemali by ste pridávať fotografické ID k PGP2 kľú�u.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vložte identifikátor užívateľa povereného revokáciou: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kľú� vo formáte PGP 2.x nemožno poveriť revokáciou\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "kľú� nemožno poveriť revokáciou ním samým\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROVANIE: Tento kľú� bol revokovaný jeho ur�eným revokátorom/!\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROVANIE: ozna�enie kľú�a ako revokovací už nemôže byť zrušené!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ste si istý, že chcete ozna�iť tento kľú� ako revokovací? (a/N): "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Ste si istý, že chcete ozna�iť tento kľú� ako revokovací? (a/N): "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Mením dobu platnosti sekundárneho kľú�a.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Mením dobu platnosti primárneho kľú�a.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nemôžete zmeniť dobu platnosti kľú�a verzie 3\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Mením dobu platnosti sekundárneho kľú�a.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Mením dobu platnosti primárneho kľú�a.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROVANIE: podpisovací podkľú� %08lX nie je krížovo certifikovaný\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte práve jedno id užívateľa.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "presko�ený v3 podpis kľú�a ním samým u užívateľského id \"%s\"\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 #, 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:5344
+#: g10/keyedit.c:5400
 #, 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:5404
+#: g10/keyedit.c:5460
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisová notácia: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prepísať (a/N)? "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, 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:5784
+#: g10/keyedit.c:5840
 #, 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:5806
+#: g10/keyedit.c:5862
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id užívateľa: \""
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (nexeportovateľné)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnosť podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvoriť pre tento podpis revoka�ný certifikát? (a/N)"
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovateľné)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokované %08lX v %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte sa revokovať tieto podpisy:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvoriť revoka�né certifikáty? (a/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "neexistuje tajný kľú�\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5739,7 +5889,7 @@ msgstr ""
 "entropie.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie kľú�a sa nepodarilo: %s\n"
@@ -5808,11 +5958,11 @@ msgstr "nenájdený zapisovateľný súbor verejných kľú�ov (pubring): %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:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "verejný a tajný kľú� boli vytvorené a podpísané.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5821,7 +5971,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5829,7 +5979,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:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5837,23 +5987,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:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvoriť? "
@@ -6070,273 +6220,273 @@ msgstr "požadujem kľú� %08lX z %s\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROVANIE: nemôžem vymazať do�asný súbor (%s) `%s': %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "zvláštna veľkosť šifrovacieho kľú�a pre sedenie (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kľú� šifrovaného sedenia\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "zašifrované neznámym algoritmom %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejný kľú� je %08lX\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, 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:594
+#: g10/mainproc.c:632
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "zašifrované %u-bitovým %s kľú�om, ID %08lX, vytvoreným %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zašifrovaná %s kľú�om, ID %08lX\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dešifrovanie verejným kľú�om zlyhalo: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zašifrované s %lu heslami\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zašifrované jedným heslom\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpokladám %s šifrovaných dát\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: správa nemá ochranu integrity\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "dešifrovanie o.k.\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so zašifrovanou správou bolo manipulované!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pôvodné meno súboru='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Dobrý podpis od \""
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypršanou platnosťou od \""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobrý podpis od \""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikácia podpisu potla�ená\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, 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:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Kľú� k dispozícii na: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[neistý]  "
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnosť podpisu vyprší %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binárne"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "textový mód"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "neznáme"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "neznámy algoritmus verejného kľú�a"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemôžem overiť podpis: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelený od dokumentu\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatný podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starého typu (PGP 2.x)\n"
@@ -6405,68 +6555,68 @@ msgstr "chyba pri �ítaní: %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: použitie parametra \"%s\" sa neodporú�a\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: použitie parametra \"%s\" sa neodporú�a\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "použite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: použitie parametra \"%s\" sa neodporú�a\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "VAROV�N�: použitie parametra \"%s\" sa neodporú�a\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "VAROV�N�: použitie parametra \"%s\" sa neodporú�a\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Nekomprimované"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimované"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "táto správa nemusí použiteľná s %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "�ítam možnosti z `%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "neznáma trieda podpisu"
@@ -6502,24 +6652,24 @@ msgstr "zapisujem na štandardný výstup (stdout)\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "predpokladám podpísané dáta v `%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemôžem pracovať s algoritmom verejného kľú�a %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpe�ný symetricky šifrovaný kľú� sedenia\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kritická podpisová notácia: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d má nastavený kritický bit\n"
@@ -6945,12 +7095,12 @@ msgstr "neznámy implicitný adresát `%s'\n"
 msgid "no valid addressees\n"
 msgstr "žiadne platné adresy\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "kľú� %08lX: chyba identifikátor užívateľa\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kľú� %08lX: chyba identifikátor užívateľa\n"
@@ -7389,7 +7539,7 @@ msgstr ""
 "presko�ený `%s': toto je vygenerovaný PGP kľú� podľa algoritmu ElGamal,\n"
 "podpisy vytvorené týmto kľú�om nie sú bezpe�né!\n"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "záznam dôvery %lu, typ %d: zápis zlyhal: %s\n"
@@ -7439,7 +7589,7 @@ msgstr "chyba pri hľadaní záznamu dôvery: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "chyba pri �ítaní: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "databáza dôvery: synchronizácia zlyhala %s\n"
@@ -7948,100 +8098,100 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' nie je platné dlhé keyID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, fuzzy, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "kľú� %08lX: akceptovaný ako dôveryhodný kľú�\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, fuzzy, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "kľú� %08lX sa v databáze dôvery vyskytuje viac ako raz\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr ""
 "kľú� %08lX: nenájdený verejný kľú� k dôveryhodnému kľú�u - presko�ené\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "kľú� ozna�ený ako absolútne dôveryhodný.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "záznam dôvery %lu, typ pož. %d: �ítanie zlyhalo: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "záznam dôvery %lu nie je požadovaného typu %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutné kontrolovať databázu dôvery\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dalšia kontrola databázy dôvery %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "nie je nutné kontrolovať databázu dôvery\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "nie je nutné kontrolovať databázu dôvery\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "verejný kľú� %08lX nebol nájdený: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "prosím vykonajte --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontrolujem databázu dôvery\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, 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:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8049,45 +8199,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli nájdené žiadne absolútne dôveryhodné kľú�e\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 ""
 
@@ -8099,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 "[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 ""
 
@@ -8183,35 +8333,35 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 #, 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "zmeniť heslo"
@@ -8279,7 +8429,7 @@ msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľú�ov: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
@@ -8344,7 +8494,7 @@ msgstr ""
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo poslať kľú� na server: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
@@ -8490,13 +8640,13 @@ msgstr "%s podpis, hashovací algoritmus %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
@@ -8513,81 +8663,87 @@ msgstr "zmeniť heslo"
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|MENO|použiť MENO ako implicitného adresáta"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|MENO|použiť MENO ako implicitného adresáta"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "vôbec nepoužívať terminál"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:179
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "konfliktné príkazy\n"
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
-msgstr ""
-
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, fuzzy, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "chyba pri zápise do súboru tajných kľú�ov `%s': %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8646,7 +8802,7 @@ msgstr ""
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8812,7 +8968,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -8866,7 +9022,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -8877,7 +9033,7 @@ msgstr "nespracované"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 #, fuzzy
 msgid "none"
 msgstr "nie"
@@ -8913,42 +9069,37 @@ msgstr ""
 "\"%.*s\"\n"
 "kľú� s dĺžkou %u bitov, typ %s, ID %08lX, vytvorený %s%s\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, fuzzy, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "chyba pri zápise do súboru tajných kľú�ov `%s': %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
@@ -9142,6 +9293,11 @@ msgstr "Vytvoriť pre tento podpis revoka�ný certifikát? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "chyba pri vytváraní hesla: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9222,138 +9378,136 @@ msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Žiadny popis)\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 #, fuzzy
 msgid "list external keys"
 msgstr "vypísať zoznam tajných kľú�ov"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 #, fuzzy
 msgid "list certificate chain"
 msgstr "nesprávny certifikát"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "import certificates"
 msgstr "nesprávny certifikát"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 #, fuzzy
 msgid "export certificates"
 msgstr "nesprávny certifikát"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:258
-#, fuzzy
-msgid "create base-64 encoded output"
-msgstr "vytvor výstup zakódovaný pomocou ASCII"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "vôbec nepoužívať terminál"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr ""
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr ""
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:278
-msgid "never consult a CRL"
-msgstr ""
+#: sm/gpgsm.c:320
+#, fuzzy
+msgid "create base-64 encoded output"
+msgstr "vytvor výstup zakódovaný pomocou ASCII"
 
-#: sm/gpgsm.c:288
-msgid "check validity using OCSP"
-msgstr ""
+#: sm/gpgsm.c:330
+#, fuzzy
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|MENO|použi MENO ako implicitný tajný kľú�"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
+#: sm/gpgsm.c:341
+#, fuzzy
+msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
+"pridať tento súbor kľú�ov do zoznamu\n"
+" používaných súborov kľú�ov"
 
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:299
-msgid "do not check certificate policies"
+#: sm/gpgsm.c:354
+#, fuzzy
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|ALG|použiť šifrovací algoritmus ALG pre heslá"
+
+#: sm/gpgsm.c:372
+msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "vôbec nepoužívať terminál"
+#: sm/gpgsm.c:380
+msgid "check validity using OCSP"
+msgstr ""
 
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
+#: sm/gpgsm.c:382
+msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:321
-#, fuzzy
-msgid "|FILE|write an audit log to FILE"
-msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|ALG|použiť šifrovací algoritmus ALG"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|ALG|použiť hashovací algoritmus ALG"
+
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "dávkový režim: nikdy sa na ni� nepýtať"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "automaticky odpovedať áno na vä�šinu otázok"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "automaticky odpovedať NIE na vä�šinu otázok"
 
-#: sm/gpgsm.c:329
+#: sm/gpgsm.c:418
 #, fuzzy
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr ""
-"pridať tento súbor kľú�ov do zoznamu\n"
-" používaných súborov kľú�ov"
-
-#: sm/gpgsm.c:332
-#, fuzzy
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|MENO|použi MENO ako implicitný tajný kľú�"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-#, 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:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|ALG|použiť šifrovací algoritmus ALG"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|ALG|použiť hashovací algoritmus ALG"
+msgid "|FILE|write an audit log to FILE"
+msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9364,27 +9518,27 @@ msgstr ""
 "podpísať, overiť, šifrovať alebo dešifrovať\n"
 "implicitné operácie závisia od vstupných dát\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nemôžem zavrieť `%s': %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9444,7 +9598,7 @@ msgstr "rev? problém overenia revokácie: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr ""
 
@@ -9474,7 +9628,7 @@ msgid ""
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9519,23 +9673,23 @@ msgstr ""
 msgid "algorithm:"
 msgstr "ASCII kódovanie: %s\n"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, fuzzy, c-format
 msgid "Good signature from"
 msgstr "Dobrý podpis od \""
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, fuzzy, c-format
 msgid "                aka"
 msgstr "                alias \""
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, fuzzy, c-format
 msgid "This is a qualified signature\n"
 msgstr ""
@@ -10332,116 +10486,142 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-msgid "run without asking a user"
-msgstr "Ukon�iť bez uloženia? "
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:242
+#, fuzzy
+msgid "|URL|use keyserver at URL"
+msgstr "nemožno použiť URI servera kľú�ov - chyba analýzy URI\n"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr ""
+
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr ""
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr ""
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr ""
+"|POČ�TAČ|použi tento server kľú�ov na vyhľadávanie\n"
+" kľú�ov"
+
+#: dirmngr/dirmngr.c:271
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:227
-#, 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:279
+msgid "Configuration for OCSP"
+msgstr ""
 
-#: dirmngr/dirmngr.c:229
-msgid "|FPR|OCSP response signed by FPR"
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+#: dirmngr/dirmngr.c:285
+#, 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:287
+msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10455,95 +10635,95 @@ msgstr ""
 "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
 "možností)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "použitie: gpg [možnosti] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "riadok je príliš dlhý\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "chyba pri �ítaní: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "nespracované"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -10736,93 +10916,93 @@ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 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:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, 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:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10832,68 +11012,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -10939,7 +11119,7 @@ msgstr "duplicita predvoľby %c%lu\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 #, fuzzy
 msgid "quiet"
 msgstr "ukon�iť"
@@ -11033,308 +11213,157 @@ msgstr "podpisovanie zlyhalo: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr ""
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr ""
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr ""
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr ""
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr ""
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr ""
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr ""
-
-#: tools/gpgconf-comp.c:588
-#, fuzzy
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|použiť mód hesla N"
-
-#: tools/gpgconf-comp.c:592
-#, fuzzy
-msgid "do not allow the reuse of old passphrases"
-msgstr "chyba pri vytváraní hesla: %s\n"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr ""
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|MENO|použi MENO ako implicitný tajný kľú�"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-#, fuzzy
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|MENO|šifrovať pre MENO"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr ""
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-#, fuzzy
-msgid "|URL|use keyserver at URL"
-msgstr "nemožno použiť URI servera kľú�ov - chyba analýzy URI\n"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr ""
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "importovať kľú�e zo servera kľú�ov"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-msgid "include the public key in signatures"
-msgstr "skontrolovať podpisy kľú�ov"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr ""
-
-#: tools/gpgconf-comp.c:838
-#, fuzzy
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|ALG|použiť šifrovací algoritmus ALG pre heslá"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr ""
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr ""
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr ""
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr ""
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "chyba siete"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "nesprávne heslo"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "verejný kľú� nenájdený"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr ""
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr ""
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 #, fuzzy
 msgid "list global configuration file"
 msgstr "neznáma položka konfigurácie \"%s\"\n"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 #, fuzzy
 msgid "check global configuration file"
 msgstr "neznáma položka konfigurácie \"%s\"\n"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "aktualizovať databázu dôvery"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr ""
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr ""
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr ""
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "použiť ako výstupný súbor"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 #, fuzzy
 msgid "Component not found"
 msgstr "verejný kľú� nenájdený"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 #, fuzzy
 msgid "No argument allowed"
 msgstr "zapisujem tajný kľú� do `%s'\n"
@@ -11351,6 +11380,27 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "zapisujem do '%s'\n"
+
+#, fuzzy
+#~ msgid "use a log file for the server"
+#~ msgstr "vyhľadať kľú�e na serveri kľú�ov"
+
+#, fuzzy
+#~ msgid "run without asking a user"
+#~ msgstr "Ukon�iť bez uloženia? "
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "importovať kľú�e zo servera kľú�ov"
+
+#, fuzzy
+#~ msgid "include the public key in signatures"
+#~ msgstr "skontrolovať podpisy kľú�ov"
+
+#, fuzzy
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "požadujem kľú� %08lX z %s\n"
 
@@ -11490,10 +11540,6 @@ msgstr ""
 #~ msgstr "nemožno otvoriť %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "chyba pri zápise súboru kľú�ov (keyring)  `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "chyba pri �ítaní `%s': %s\n"
 
@@ -13230,9 +13276,6 @@ msgstr ""
 #~ msgid "never use a MDC for encryption"
 #~ msgstr "na šifrovanie nikdy nepoužiť MDC"
 
-#~ msgid "use the gpg-agent"
-#~ msgstr "použite gpg-agenta"
-
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[súbor]|zapíš informáciu o stave do súboru"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 19dfdec..79ef4d7 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 4c31303..edf7978 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -173,8 +173,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
@@ -220,6 +220,43 @@ msgstr "Felaktig PIN-kod"
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, 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:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Ange denna lösenfras igen"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase to protect the imported object within the "
+#| "GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
@@ -227,8 +264,8 @@ msgstr "Felaktig lösenfras"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -236,76 +273,65 @@ msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 msgid "can't create '%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, 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-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "identifierade kort med serienummer: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 #| msgid "error getting default authentication keyID of card: %s\n"
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "fel när nyckel-id för autentisering hämtades från kortet: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "ingen lämplig kortnyckel hittades: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Ange lösenfrasen för ssh-nyckeln%0A  %c"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Ange denna lösenfras igen"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -314,97 +340,93 @@ msgstr ""
 "Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A   %s%%0Ai  "
 "gpg-agents nyckellager"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "Mata in kortet med serienummer"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "Ta bort det aktuella kortet och mata in det med serienummer"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "Admin PIN-kod"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK-kod"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Nollställ kod"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's keypad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0AAnvänd läsarens knappsats för inmatning."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Upprepa denna nollställningskod"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "Upprepa denna PUK-kod"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Upprepa denna PIN-kod"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Nollställningskoden repeterades inte korrekt; försök igen"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK-koden repeterades inte korrekt; försök igen"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-kod repeterades inte korrekt; försök igen"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "fel när temporärfil skapades: %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "fel vid skrivning till temporärfil: %s\n"
+#: agent/genkey.c:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "fel vid skrivning till %s: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Ange ny lösenfras"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "Ta den här ändå"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, 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:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -413,11 +435,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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Ja, skydd behövs inte"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -425,7 +447,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:296
+#: agent/genkey.c:282
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -443,7 +465,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:323
+#: agent/genkey.c:309
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
@@ -453,7 +475,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:338
+#: agent/genkey.c:324
 #, fuzzy
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -467,165 +489,238 @@ msgstr ""
 "vara minst %u tecken lång."
 
 # fel kapitalisering i originalet?
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Ange den nya lösenfrasen"
 
-# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Flaggor:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+#, fuzzy
+#| msgid "Options useful for debugging"
+msgid "Options used for startup"
+msgstr "Flaggor användbara för felsökning"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "kör i serverläge"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "utförlig"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "var något tystare"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "frigör inte från konsollen"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "använd en loggfil för servern"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "utförlig"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "var något tystare"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PRG|använd PRG som SCdaemon-programmet"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Flaggor som kontrollerar konfigurationen"
+
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PRG|använd PRG som SCdaemon-programmet"
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "enable ssh-agent emulation"
+msgid "enable ssh support"
+msgstr "aktivera ssh-agent-emulering"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr ""
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Flaggor som kontrollerar säkerheten"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|låt mellanlagrade SSH-nycklar gå ut efter N sekunder"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|ställ in maximal livstid för SSH-nyckel till N sekunder"
+
+#: agent/gpg-agent.c:248
 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:250
 #, 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:252
 #, 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:257
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "tillåt inte att gå förbi lösenfraspolicyn"
+
+#: agent/gpg-agent.c:267
+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:269
+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:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FIL|kontrollera nya lösenfraser mot mönster i FIL"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|låt mellanlagrad lösenfras gå ut efter N dagar"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "tillåt inte återanvändning av gamla lösenfraser"
+
+#: agent/gpg-agent.c:281
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the PIN-Entry"
+msgstr "Flaggor som kontrollerar säkerheten"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:258
+#: agent/gpg-agent.c:287
 #, fuzzy
-#| msgid "enable ssh-agent emulation"
-msgid "enable ssh support"
-msgstr "aktivera ssh-agent-emulering"
+#| 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:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr ""
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
+#: agent/gpg-agent.c:294
+#, 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:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 #, 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:553
+#: agent/gpg-agent.c:574
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -637,149 +732,158 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, 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:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, 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:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, 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:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, 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:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, 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:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 #| msgid "directory `%s' created\n"
 msgid "directory '%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, 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:2374
+#: agent/gpg-agent.c:2356
 #, 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:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, 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:2739
+#: agent/gpg-agent.c:2721
 #, 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:2744
+#: agent/gpg-agent.c:2726
 #, 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:2819
+#: agent/gpg-agent.c:2801
 #, 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:2824
+#: agent/gpg-agent.c:2806
 #, 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:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, 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:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
+# 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:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Flaggor:\n"
+" "
+
 # KEYGRIP är ett hexadecimalt värde som representerar hashen för den publika nyckeln
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
@@ -794,8 +898,8 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
 "Underhåll av lösenordscache\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -804,9 +908,8 @@ msgstr ""
 " "
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -861,50 +964,50 @@ msgstr "avbruten\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fel vid fråga efter lösenfrasen: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 #| msgid "file `%s', line %d: %s\n"
 msgid "file '%s', line %d: %s\n"
 msgstr "fil \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 #| msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "uttrycket \"%s\" ignorerat i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 #| msgid "system trustlist `%s' not available\n"
 msgid "system trustlist '%s' not available\n"
 msgstr "systemets tillitslista \"%s\" är inte tillgänglig\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 #| msgid "bad fingerprint in `%s', line %d\n"
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "felaktigt fingeravtryck i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 #| msgid "error reading `%s', line %d: %s\n"
 msgid "error reading '%s', line %d: %s\n"
 msgstr "fel vid läsning av \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
@@ -917,7 +1020,7 @@ msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -926,11 +1029,11 @@ msgstr ""
 "Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera "
 "användarcertifikat?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "Nej"
@@ -943,7 +1046,7 @@ msgstr "Nej"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -955,22 +1058,22 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "Fel"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Observera: Den här lösenfrasen har aldrig blivit ändrad.%0ADu bör ändra den "
 "nu."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -979,15 +1082,15 @@ msgstr ""
 "Den här lösenfrasen har inte ändrats%%0Asedan %.4s-%.2s-%.2s.  Du bör ändra "
 "den nu."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "ändra lösenfras"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "Jag ändrar den senare"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -995,13 +1098,13 @@ msgid ""
 "%%0A?"
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "aktivera nyckel"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1033,7 +1136,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1051,13 +1154,13 @@ msgstr "skyddsalgoritmen %d%s stöds inte\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "skyddsalgoritmen %d%s stöds inte\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fel när ett rör skapades: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
@@ -1065,43 +1168,43 @@ msgstr "fel när ett rör skapades: %s\n"
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "fel när ett rör skapades: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 #| msgid "error running `%s': probably not installed\n"
 msgid "error running '%s': probably not installed\n"
 msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error running '%s': exit status %d\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 #| msgid "error running `%s': terminated\n"
 msgid "error running '%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 #| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fel vid hämtning av avslutskod för processen %d: %s\n"
@@ -1133,13 +1236,13 @@ msgstr "Varning: osäkert ägarskap på %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "väntar %d sekunder för att agenten ska komma igång\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
@@ -1200,23 +1303,23 @@ 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:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1531,7 +1634,7 @@ msgstr "ogiltig flagga"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid argument for option \"%.50s\"\n"
@@ -1562,19 +1665,19 @@ msgstr "kommandot \"%.50s\" är tvetydigt\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "ogiltig flagga \"%.50s\"\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1596,44 +1699,44 @@ msgstr "iconv_open misslyckades: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 #| msgid "error writing to `%s': %s\n"
 msgid "error writing to '%s': %s\n"
 msgstr "fel vid skrivning till \"%s\": %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "tar bort gammal låsfil (skapad av %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "väntar på lås (hålls av %d%s) %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(dödläge?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 #| msgid "lock `%s' not made: %s\n"
 msgid "lock '%s' not made: %s\n"
 msgstr "låset \"%s\" gjordes inte: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "väntar på låset %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s är för gammal (behöver %s, har %s)\n"
@@ -1884,23 +1987,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, 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:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, 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:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1916,8 +2019,8 @@ msgstr "Detta kommando är endast tillgängligt för kort av version 2\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1927,122 +2030,122 @@ msgstr "Vad väljer du? "
 msgid "[not set]"
 msgstr "[inte inställt]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "tvingad"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 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:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 #| msgid "error writing `%s': %s\n"
 msgid "error writing '%s': %s\n"
 msgstr "fel vid skrivning till \"%s\": %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -2053,73 +2156,73 @@ msgstr ""
 "      kontrollera dokumentationen för ditt kort för att se vilka storlekar\n"
 "      som tillåts.\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA och Elgamal\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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,39 +2230,39 @@ msgstr ""
 "Kortet kommer nu att konfigureras om för att generera en nyckel med %u "
 "bitar\n"
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, 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:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 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:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2174,181 +2277,181 @@ msgstr ""
 "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 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:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "KEYTOCARD failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "Signera den? (j/N) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, 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:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "ändra kortinnehavarens kön"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "lås upp PIN-koden med en nollställningskod"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
 # originalet borde ha ett value
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/kort> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (prova med \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2411,8 +2514,8 @@ msgid "subkey"
 msgstr "Publik nyckel: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
@@ -2452,27 +2555,27 @@ msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
 msgid "using cipher %s\n"
 msgstr "använder %s-chiffer\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "\"%s\" är redan komprimerad\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgid "digest algorithm '%s' may not be used in %s mode\n"
@@ -2499,7 +2602,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2508,35 +2617,35 @@ msgstr ""
 "VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s-läget\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-krypterad data\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
 # I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2544,7 +2653,7 @@ msgstr ""
 "VARNING: meddelandet krypterades med en svag nyckel\n"
 "i det symmetriska chiffret.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "problem vid hanteringen av krypterat paket\n"
@@ -2740,230 +2849,288 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "skapa en signatur"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "skapa en klartextsignatur"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering endast med symmetriskt chiffer"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "lista nycklar"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "lista nycklar och signaturer"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "skriv ut kontrollsummor"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAMN|kryptera även till användaridentiteten NAMN"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|ange e-postalias (ett eller flera)"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "använd strikt OpenPGP-beteende"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "gör inga ändringar"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "fråga innan överskrivning"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the input"
+msgstr "Flaggor som kontrollerar säkerheten"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+#, fuzzy
+#| msgid "Options controlling the diagnostic output"
+msgid "Options controlling the output"
+msgstr "Flaggor som kontrollerar diagnosutdata"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|FIL|skriv utdata till FIL"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-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:726
+msgid "use canonical text mode"
+msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 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:587
-msgid "use canonical text mode"
-msgstr "använd \"ursprunglig text\"-läget"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+#, fuzzy
+#| msgid "Options controlling the interactivity and enforcement"
+msgid "Options controlling key import and export"
+msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|FIL|skriv utdata till FIL"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MEKANISMER|använd MEKANISMER för att hitta nycklar efter e-postadress"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "gör inga ändringar"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "inaktivera all åtkomst till dirmngr"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "fråga innan överskrivning"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+#, fuzzy
+#| msgid "Options controlling the configuration"
+msgid "Options controlling key listings"
+msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "använd strikt OpenPGP-beteende"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "lista hemliga nycklar"
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+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:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2971,7 +3138,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -3001,14 +3168,14 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -3023,7 +3190,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3031,85 +3198,85 @@ msgstr ""
 "\n"
 "Algoritmer som stöds:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "användning: gpgsm [flaggor] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, 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:1627
+#: g10/gpg.c:1653
 #, 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:1630
+#: g10/gpg.c:1656
 #, 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:1636
+#: g10/gpg.c:1662
 #, 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:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, 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:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3119,21 +3286,21 @@ msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3144,482 +3311,482 @@ msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, 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:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, 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:3086
+#: g10/gpg.c:3085
 #, 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:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, 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:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, 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:3178
+#: g10/gpg.c:3177
 #, 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:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, 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:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, 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:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, 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:3837
+#: g10/gpg.c:3835
 #, 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:3839
+#: g10/gpg.c:3837
 #, 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:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, 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:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, 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:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
@@ -3635,7 +3802,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
@@ -4373,7 +4540,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
@@ -4550,8 +4717,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:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
@@ -4763,7 +4930,7 @@ msgstr ""
 "signaturer\n"
 "  (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
@@ -4814,7 +4981,7 @@ msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Verkligen flytta den primära nyckeln? (j/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja exakt en nyckel.\n"
 
@@ -4894,177 +5061,177 @@ msgstr "Spara ändringar? (j/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 #| msgid "failed to get the fingerprint\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "misslyckades med att få fingeravtrycket\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Ingen sådan användaridentitet.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "Nothing to sign with key %s\n"
 msgid "Nothing to sign.\n"
 msgstr "Det finns inget att signera med nyckeln %s\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Inte signerad av dig.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Nyckelserver no-modify"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-"
 "typ.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Följande nyckel blev spärrad den %s av %s nyckel %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5072,17 +5239,17 @@ msgstr ""
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "spärrad"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "utgånget"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5092,18 +5259,18 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5112,36 +5279,36 @@ msgstr ""
 "VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto-id kan\n"
 "         vissa versioner av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Verkligen ta bort denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5149,20 +5316,20 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Raderade %d signatur.\n"
 msgstr[1] "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5170,17 +5337,17 @@ msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
 msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentitet \"%s\": redan minimerad\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5190,42 +5357,42 @@ msgstr ""
 "denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2.x-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan inte ange en nyckel som sin egen spärrnyckel\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "den här nyckeln har redan markerats som en spärrnyckel\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ångra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5235,183 +5402,183 @@ msgid ""
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
 # Vad betyder det?
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 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:5343
+#: g10/keyedit.c:5399
 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:5344
+#: g10/keyedit.c:5400
 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:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, 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:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 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:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, 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"
@@ -5897,7 +6064,7 @@ msgstr ""
 "en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
@@ -5971,12 +6138,12 @@ msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 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:5229
+#: g10/keygen.c:5226
 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"
@@ -5986,7 +6153,7 @@ msgstr ""
 "syfte.\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5994,7 +6161,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:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -6002,23 +6169,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:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
@@ -6234,74 +6401,74 @@ msgstr "begär nyckeln %s från %s\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s krypterad sessionsnyckel\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "publik nyckel är %s\n"
 
 # Men jag ändrade så det blev närmare originalet. Per
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, id %s, skapad %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, id %s\n"
 
 # Motsatsen till kryptering med symmetrisk nyckel.
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "VARNING: multipla klartexter har påträffats\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenfras\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
@@ -6309,191 +6476,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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, 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:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "ingen signatur hittades\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \"%s\""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utlämnad\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "             med %s-nyckeln %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, 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:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritm: %s"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6501,12 +6668,12 @@ msgstr ""
 "VARNING: multipla signaturer upptäckta. Endast den första kommer att "
 "kontrolleras.\n"
 
-#: g10/mainproc.c:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
@@ -6576,72 +6743,72 @@ msgstr "läsfel i \"%s\":  %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VARNING: \"%s\" är ett föråldrat kommando - använd det inte\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "detta meddelande kanske inte kan användas av %s\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 #| msgid "ambiguous option `%s'\n"
 msgid "ambiguous option '%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown option '%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, fuzzy, c-format
 #| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "DSA kräver att hashlängden är delbar med 8 bitar\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6677,23 +6844,23 @@ msgstr "skriver till standard ut\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "antar att signerad data finns i filen \"%s\"\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritmen %d för publika nycklar\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kritisk signaturnotation: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
@@ -7134,12 +7301,12 @@ msgstr "okänd standardmottagare \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "inga giltiga adressater\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Observera: nyckeln %s har ingen %s-förmåga\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
@@ -7601,7 +7768,7 @@ 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!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
@@ -7649,7 +7816,7 @@ msgstr "fel vid sökning av tillitsvärde i \"%s\": %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "läsfel i \"%s\":  %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
@@ -8174,101 +8341,101 @@ msgid "'%s' is not a valid long keyID\n"
 msgstr "\"%s\" är inget giltigt långt nyckel-id\n"
 
 # trusted??
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "nyckel %s: accepterad som betrodd nyckel\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "nyckeln %s förekommer fler än en gång i tillitsdatabasen\n"
 
 # nyckeln?
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "nyckel %s: ingen publik nyckel för pålitlig nyckel - hoppades över\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "nyckeln %s är markerad med förbehållslöst förtroende\n"
 
 # req står för request
 # kollat med Werner. Per
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "tillitsvärdet %lu är inte av begärd typ %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "Du kan försöka att skapa tillitsdatabasen igen med dessa kommandon:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "Referera till handboken om detta inte fungerar för dig\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "kunde inte använda okänd tillitsmodell (%d) - antar tillitsmodellen %s\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "använder tillitsmodellen %s\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 #| msgid "no need for a trustdb check with `%s' trust model\n"
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr ""
 "det behövs ingen kontroll av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 #| msgid "no need for a trustdb update with `%s' trust model\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika nyckeln %s hittades inte: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
 
 # originalet borde ha ett value
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8277,7 +8444,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:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8285,47 +8452,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, 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:2290
+#: g10/trustdb.c:2333
 #, 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"
 
@@ -8346,43 +8513,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]"
 
@@ -8434,33 +8601,33 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Ange administratörens PIN-kod"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Ange PIN-koden för standardnycklarna."
 
@@ -8530,7 +8697,7 @@ msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att lagra datum för skapandet: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "fel vid hämtning av CHV-status från kort\n"
@@ -8598,7 +8765,7 @@ msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kortet är låst permanent!\n"
@@ -8748,7 +8915,7 @@ msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8756,7 +8923,7 @@ msgstr ""
 "validering av Admin PIN-kod är för närvarande förbjudet genom detta "
 "kommando\n"
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@ -8774,59 +8941,59 @@ msgstr "||Knappa in din PIN-kod på läsarens knappsats"
 msgid "|N|Initial New PIN"
 msgstr "|N|Initial PIN-kod"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|FIL|skriv en logg till FIL"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|anslut till läsare på port N"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMN|använd NAMN som ct-API-drivrutin"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMN|använd NAMN som PC/SC-drivrutin"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "använd inte den interna CCID-drivrutinen"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|koppla från kortet efter N sekunder inaktivitet"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 #, fuzzy
 #| msgid "do not use a reader's keypad"
 msgid "do not use a reader's pinpad"
 msgstr "använd inte läsarens knappsats"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "neka användning av administratörskommandon för kort"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr ""
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "neka användning av administratörskommandon för kort"
+
+#: scd/scdaemon.c:326
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 #, fuzzy
 #| msgid ""
 #| "Syntax: scdaemon [options] [command [args]]\n"
@@ -8838,23 +9005,29 @@ msgstr ""
 "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, fuzzy, c-format
 #| msgid ""
 #| "please use the option `--daemon' to run the program in the background\n"
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8914,7 +9087,7 @@ msgstr "slår upp utfärdare på extern plats\n"
 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:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -9075,7 +9248,7 @@ msgstr "rotcertifikatet har inte markerats som betrott"
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certifikatkedjan är för lång\n"
@@ -9129,7 +9302,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -9140,7 +9313,7 @@ msgstr "slut på minne\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(det här är MD2-algoritmen)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "ingen"
 
@@ -9175,46 +9348,41 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "skapad %s, går ut %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen nyckelanvändning angiven - antar alla användningsområden\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "fel vid hämtning av nyckelanvändningsinformation: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for certification\n"
 msgid "certificate should not have been used for certification\n"
 msgstr "certifikatet skulle inte använts för certifiering\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for encryption\n"
 msgid "certificate should not have been used for encryption\n"
 msgstr "certifikatet skulle inte använts för kryptering\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for signing\n"
 msgstr "certifikatet skulle inte använts för signering\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikatet är inte användbart för kryptering\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikatet är inte användbart för signering\n"
@@ -9423,6 +9591,11 @@ msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "fel när temporärfil skapades: %s\n"
+
 #: sm/certreqgen-ui.c:438
 #, fuzzy
 #| msgid "self-signed certificate has a BAD signature"
@@ -9508,126 +9681,126 @@ msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
 msgid "no valid recipients given\n"
 msgstr "inga giltiga mottagare angavs\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "lista externa nycklar"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "lista certifikatkedja"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "importera certifikat"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "exportera certifikat"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "registrera ett smartkort"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "starta gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "skapa base-64-kodat utdata"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "använd inte terminalen alls"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|antal certifikat att inkludera"
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|FIL|hämta policyinformation från FIL"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "anta att inmatning är i PEM-format"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "anta att inmatning är i base-64-format"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "anta att inmatning är i binärformat"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "skapa base-64-kodat utdata"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID som förvald hemlig nyckel"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FIL|lägg till nyckelring till listan över nyckelringar"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "hämta saknade utfärdarcertifikat"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAMN|använd kodningen NAMN för PKCS#12-lösenfraser"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "kontrollera aldrig mot spärrlista"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "kontrollera inte spärrlistor för rotcertifikat"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "kontrollera giltigheten med OCSP"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|antal certifikat att inkludera"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|FIL|hämta policyinformation från FIL"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "kontrollera inte certifikatpolicier"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "hämta saknade utfärdarcertifikat"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "använd inte terminalen alls"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|FIL|skriv en serverlägeslogg till FIL"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FIL|skriv en granskningslogg till FIL"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAMN|använd algoritmen NAMN för kontrollsummor"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "satsläge: fråga aldrig"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "anta ja på de flesta frågorna"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "anta nej på de flesta frågorna"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FIL|lägg till nyckelring till listan över nyckelringar"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID som förvald hemlig nyckel"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAMN|använd chifferalgoritmen NAMN"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAMN|använd algoritmen NAMN för kontrollsummor"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FIL|skriv en granskningslogg till FIL"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm [options] [files]\n"
@@ -9642,31 +9815,31 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, fuzzy, c-format
 #| msgid "unknown validation model `%s'\n"
 msgid "unknown validation model '%s'\n"
 msgstr "okänd valideringsmodell \"%s\"\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, fuzzy, c-format
 #| msgid "importing common certificates `%s'\n"
 msgid "importing common certificates '%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, 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:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
@@ -9726,7 +9899,7 @@ msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "fel vid lagring av flaggor: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Fel - "
 
@@ -9765,7 +9938,7 @@ msgstr ""
 "\n"
 "%s%sÄr du säker på att du vill göra det här?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9817,24 +9990,24 @@ msgstr "[datum inte angivet]"
 msgid "algorithm:"
 msgstr "algoritm: %s"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr ""
 "ogiltig signatur: attribut för kontrollsumma matchar inte den beräknade\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Korrekt signatur från"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "      även känd som"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Det här är en kvalificerad signatur\n"
@@ -10711,128 +10884,149 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, 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:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "shutdown the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|FIL|skriv serverlägesloggar till FIL"
-
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-#| msgid "Quit without saving? (y/N) "
-msgid "run without asking a user"
-msgstr "Avsluta utan att spara? (j/N) "
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-#, fuzzy
-#| msgid "allow PKA lookups (DNS requests)"
-msgid "allow sending OCSP requests"
-msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "Konfiguration för nyckelservrar"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL| använd nyckelservern på URL"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr "Konfiguration för HTTP-servrar"
+
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "använd systemets HTTP-proxyinställningar"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "Konfiguration av LDAP-servrar som ska användas"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
+
+#: dirmngr/dirmngr.c:271
 #, 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:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 #, 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:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "Konfiguration för OCSP"
+
+#: dirmngr/dirmngr.c:281
+#, fuzzy
+#| msgid "allow PKA lookups (DNS requests)"
+msgid "allow sending OCSP requests"
+msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr ""
+
+#: dirmngr/dirmngr.c:285
 #, fuzzy
 #| msgid "|URL|use keyserver at URL"
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL| använd nyckelservern på URL"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
-msgstr ""
-
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr ""
-
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+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:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10845,13 +11039,13 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, 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:427
+#: dirmngr/dirmngr.c:461
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -10863,92 +11057,92 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, 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:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, 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:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, 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:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "inte tvingad"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -11159,103 +11353,103 @@ msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "allocating list item failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, 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:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, 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:710
 #, 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:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11266,76 +11460,76 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, 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:1720
+#: dirmngr/server.c:1727
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "start_cert_fetch failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_next_cert failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, 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:2977
+#: dirmngr/server.c:2984
 #, 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:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11388,7 +11582,7 @@ msgstr "certifikatet är korrekt\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certifikatet skulle inte använts för signering\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "tyst"
 
@@ -11492,305 +11686,154 @@ msgstr "sändande rad misslyckades: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Flaggor som kontrollerar diagnosutdata"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Flaggor som kontrollerar konfigurationen"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Flaggor användbara för felsökning"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Flaggor som kontrollerar säkerheten"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|låt mellanlagrade SSH-nycklar gå ut efter N sekunder"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|ställ in maximal livstid för SSH-nyckel till N sekunder"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "tillåt inte att gå förbi lösenfraspolicyn"
-
-#: tools/gpgconf-comp.c:576
-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"
-
-#: tools/gpgconf-comp.c:580
-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"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|FIL|kontrollera nya lösenfraser mot mönster i FIL"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|låt mellanlagrad lösenfras gå ut efter N dagar"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "tillåt inte återanvändning av gamla lösenfraser"
-
-#: tools/gpgconf-comp.c:596
-#, 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"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAMN|kryptera även till användaridentiteten NAMN"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|ange e-postalias (ett eller flera)"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "Konfiguration för nyckelservrar"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL| använd nyckelservern på URL"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MEKANISMER|använd MEKANISMER för att hitta nycklar efter e-postadress"
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "importera nycklar från en nyckelserver"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-#| msgid "list and check key signatures"
-msgid "include the public key in signatures"
-msgstr "lista och kontrollera nyckelsignaturer"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "inaktivera all åtkomst till dirmngr"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAMN|använd kodningen NAMN för PKCS#12-lösenfraser"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "kontrollera inte spärrlistor för rotcertifikat"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Flaggor som kontrollerar formatet på utdata"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
-
-#: tools/gpgconf-comp.c:978
-#, fuzzy
-#| msgid "Options controlling the security"
-msgid "Options controlling the use of Tor"
-msgstr "Flaggor som kontrollerar säkerheten"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "Konfiguration för HTTP-servrar"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "använd systemets HTTP-proxyinställningar"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "Konfiguration av LDAP-servrar som ska användas"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "LDAP-serverlista"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "Konfiguration för OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
-msgid "Private Keys"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
-msgid "Smartcards"
+#: tools/gpgconf-comp.c:633
+msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
+#: tools/gpgconf-comp.c:637
+msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 #| msgid "Bad Passphrase"
 msgid "Passphrase Entry"
 msgstr "Felaktig lösenfras"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 #| msgid "Component not found"
 msgid "Component not suitable for launching"
 msgstr "Komponenten hittades inte"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, 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:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Extern validering av komponenten %s misslyckades"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Observera att gruppspecifikationer ignoreras\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, 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:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
 msgstr "fel i \"%s\": %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "lista alla komponenter"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "kontrollera alla program"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENT|lista flaggor"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENT|ändra flaggor"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENT|kontrollera flaggor"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "tillämpa globala standardvärden"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 #, fuzzy
 #| msgid "|FILE|take policy information from FILE"
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FIL|hämta policyinformation från FIL"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 #, fuzzy
 #| msgid "get the configuration directories for gpgconf"
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "hämta konfigurationskatalogerna för gpgconf"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "lista global konfigurationsfil"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "kontrollera global konfigurationsfil"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 #, fuzzy
 #| msgid "list all components"
 msgid "reload all or a given component"
 msgstr "lista alla komponenter"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 #, fuzzy
 #| msgid "list all components"
 msgid "launch a given component"
 msgstr "lista alla komponenter"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 #, fuzzy
 #| msgid "list all components"
 msgid "kill a given component"
 msgstr "lista alla komponenter"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "aktivera ändringar vid körtid, om möjligt"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgconf [options]\n"
@@ -11802,15 +11845,15 @@ msgstr ""
 "Syntax: gpgconf [flaggor]\n"
 "Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Behöver ett komponentargument"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Komponenten hittades inte"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "Inget argument tillåts"
 
@@ -11826,6 +11869,44 @@ msgstr ""
 "Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
 "Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "fel vid skrivning till temporärfil: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "använd en loggfil för servern"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|FIL|skriv en serverlägeslogg till FIL"
+
+#, fuzzy
+#~| msgid "Quit without saving? (y/N) "
+#~ msgid "run without asking a user"
+#~ msgstr "Avsluta utan att spara? (j/N) "
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "importera nycklar från en nyckelserver"
+
+#, fuzzy
+#~| msgid "list and check key signatures"
+#~ msgid "include the public key in signatures"
+#~ msgstr "lista och kontrollera nyckelsignaturer"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "Flaggor som kontrollerar formatet på utdata"
+
+#, fuzzy
+#~| msgid "Options controlling the security"
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Flaggor som kontrollerar säkerheten"
+
+#~ msgid "LDAP server list"
+#~ msgstr "LDAP-serverlista"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "begär nyckeln %s från %s-servern %s\n"
 
@@ -11988,9 +12069,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "kunde inte öppna %s för skrivning: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "fel vid skrivning till %s: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "fel vid läsning från %s: %s\n"
 
@@ -12159,9 +12237,6 @@ msgstr ""
 #~ msgid "listen() failed: %s\n"
 #~ msgstr "listen() misslyckades: %s\n"
 
-#~ msgid "do not grab keyboard and mouse"
-#~ msgstr "fånga inte tangentbord och mus"
-
 #~ msgid "Error: URL too long (limit is %d characters).\n"
 #~ msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
 
diff --git a/po/tr.gmo b/po/tr.gmo
index c0a5121..88ea769 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index 6e75e6d..481b3bc 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -140,8 +140,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "aynı değiller - tekrar deneyin"
 
@@ -186,13 +186,51 @@ msgstr "PIN hatalı"
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, 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:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Lütfen bu anahtar parolasını tekrar girin"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase to protect the imported object within the "
+#| "GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
+"giriniz."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, fuzzy, c-format
@@ -200,76 +238,65 @@ msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 msgid "can't create '%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "kartın seri numarası alınırken hata: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "Algılanan kartın seri nr: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, fuzzy, c-format
 #| msgid "error getting default authentication keyID of card: %s\n"
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "kartın öntanımlı kimlik doğrulama anahtar kimliği alınırken hata: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "uygun bir kart anahtarı yok: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "saklanmış bayraklar alınırken hata: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Lütfen SSH anahtarı %0A  %c için anahtar parolasını giriniz"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Lütfen bu anahtar parolasını tekrar girin"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -278,99 +305,95 @@ msgstr ""
 "gpg-agent'in anahtar deposuna korumak için alınan gizli anahtar %%0A  %s%%0A "
 "için lütfen anahtar parolası giriniz"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "sokette akım oluşturulamadı: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr ""
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "Yönetici PIN'i"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Sıfırlama Kodu"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 #, fuzzy
 #| msgid "do not use a reader's keypad"
 msgid "Use the reader's pinpad for input."
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Bu Sıfırlama Kodu tekrarlansın"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Bu PIN tekrarlansın "
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Bu PIN tekrarlansın "
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Sıfırlama Kodu doğru tekrarlanmadı; tekrar deneyin"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "geçici dosya oluşturulurken hata: %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "geçeci dosyaya yazma hatası: %s\n"
+#: agent/genkey.c:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "%s yazılırken hata: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Yeni anahtar parolasını giriniz"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "Ne olursa olsun bunu al"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, 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:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -379,11 +402,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:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Evet, korumak gereksiz"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -391,7 +414,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:296
+#: agent/genkey.c:282
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -409,7 +432,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:323
+#: agent/genkey.c:309
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
@@ -419,7 +442,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:338
+#: agent/genkey.c:324
 #, fuzzy
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -432,162 +455,237 @@ msgstr ""
 "Uyarı: Girdiğiniz anahtar parolası güvenli değil.%%0AParola en az %u "
 "karakterlik olmalı."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, 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:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Seçenekler:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+#, fuzzy
+#| msgid "Options useful for debugging"
+msgid "Options used for startup"
+msgstr "Hata ayıklamaya elverişli seçenekler"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "sunucu kipinde çalışır"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "ayrıntılı"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "biraz daha sessiz olur"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "konsoldan kopulmaz"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "konsoldan kopulmaz"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Tanı çıktısını denetleyen seçenekler"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "sunucu için bir günlük dosyası kullanılır"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Yapılandırmayı denetleyen seçenekler"
+
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "Akıllı kart süreci kullanılmaz"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
+
+#: agent/gpg-agent.c:213
 #, 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:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "TTY değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "X birimi değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+#, fuzzy
+#| msgid "enable ssh-agent emulation"
+msgid "enable ssh support"
+msgstr "ssh-agent öykünümü etkinleşir"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr ""
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Güvenliği denetleyen seçenekler"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|SSH anahtarları N saniyede zamanaşımına uğrar"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|azami SSH anahtarı ömrü N saniyeye ayarlanır"
+
+#: agent/gpg-agent.c:248
 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:250
 #, 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:252
 #, 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:257
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
-msgstr ""
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "anahtar parolası kuralının atlanmasına izin verilmez"
+
+#: agent/gpg-agent.c:267
+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:269
+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:272
+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:276
+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:258
+#: agent/gpg-agent.c:278
+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:281
 #, fuzzy
-#| msgid "enable ssh-agent emulation"
-msgid "enable ssh support"
-msgstr "ssh-agent öykünümü etkinleşir"
+#| msgid "Options controlling the security"
+msgid "Options controlling the PIN-Entry"
+msgstr "Güvenliği denetleyen seçenekler"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
+msgstr ""
+
+#: agent/gpg-agent.c:287
+#, 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:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
+
+#: agent/gpg-agent.c:294
+#, 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:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 #, 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:553
+#: agent/gpg-agent.c:574
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -599,147 +697,155 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, 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:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özet algoritması geçersiz\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, 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:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, 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:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, 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:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, 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:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "soket için tuz alınırken hata\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, 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:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 #| msgid "listening on socket `%s'\n"
 msgid "listening on socket '%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, fuzzy, c-format
 #| msgid "directory `%s' created\n"
 msgid "directory '%s' created\n"
 msgstr "dizin `%s' oluÅŸturuldu\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, 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:2374
+#: agent/gpg-agent.c:2356
 #, 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:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, 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:2744
+#: agent/gpg-agent.c:2726
 #, 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:2819
+#: agent/gpg-agent.c:2801
 #, 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:2824
+#: agent/gpg-agent.c:2806
 #, 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:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, 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:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Seçenekler:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
@@ -753,8 +859,8 @@ msgstr ""
 "Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
 "Parola arabelleği bakımcısı\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -762,9 +868,8 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -821,50 +926,50 @@ msgstr "iptal edildi\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "anahtar parolası sorulurken hata: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
 msgstr "'%s' açılırken hata: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 #| msgid "file `%s', line %d: %s\n"
 msgid "file '%s', line %d: %s\n"
 msgstr "`%s' dosyası, %d. satır: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 #| msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "`%2$s' dosyasının %3$d. satırındaki \"%1$s\" deyimi yoksayıldı\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 #| msgid "system trustlist `%s' not available\n"
 msgid "system trustlist '%s' not available\n"
 msgstr "sistem güvence listesi `%s' kullanım dışı\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 #| msgid "bad fingerprint in `%s', line %d\n"
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "`%s', %d. satırda parmakizi hatalı\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, fuzzy, c-format
 #| msgid "error reading `%s', line %d: %s\n"
 msgid "error reading '%s', line %d: %s\n"
 msgstr "`%s' okunurken %d. satırda hata: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
@@ -877,7 +982,7 @@ msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -886,11 +991,11 @@ msgstr ""
 "Kullanıcı sertifikalarının%%0A  \"%s\"%%0Aile doğru olarak onaylanacağından "
 "son derece emin misiniz?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Evet"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "Hayır"
@@ -903,7 +1008,7 @@ msgstr "Hayır"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -915,21 +1020,21 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "DoÄŸru"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Bilginize: Bu anahtar parolası hiç değişmedi%0ALütfen şimdi değiştirin."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -938,15 +1043,15 @@ msgstr ""
 "Bu anahtar parolası %.4s-%.2s-%.2s tarihinden beri hiç değişmedi%%0ALütfen "
 "ÅŸimdi deÄŸiÅŸtirin."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Anahtar parolasını değiştir"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "Sonra deÄŸiÅŸtireceÄŸim"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -954,13 +1059,13 @@ msgid ""
 "%%0A?"
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "anahtarı kullanıma sokar"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -992,7 +1097,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:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1010,13 +1115,13 @@ msgstr "koruma algoritması %d%s desteklenmiyor\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "koruma algoritması %d%s desteklenmiyor\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "boru oluÅŸturulurken hata: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, fuzzy, c-format
@@ -1024,43 +1129,43 @@ msgstr "boru oluÅŸturulurken hata: %s\n"
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "boru oluÅŸturulurken hata: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "süreç çatallanırken hata: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, fuzzy, c-format
 #| msgid "error running `%s': probably not installed\n"
 msgid "error running '%s': probably not installed\n"
 msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error running '%s': exit status %d\n"
 msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, fuzzy, c-format
 #| msgid "error running `%s': terminated\n"
 msgid "error running '%s': terminated\n"
 msgstr "`%s' çalışırken hata: sonlandırıldı\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 #| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "süreç %d çıkış kodu alınırken hata: %s\n"
@@ -1091,13 +1196,13 @@ msgstr "UYARI: %s üzerinde sahiplik güvensiz: \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 #| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
@@ -1158,23 +1263,23 @@ 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:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "yeterli bellek ayrılırken hata: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1496,7 +1601,7 @@ msgstr "geçersiz seçenek"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid argument for option \"%.50s\"\n"
@@ -1527,19 +1632,19 @@ msgstr "\"%.50s\" komutu belirsiz\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "geçersiz seçenekler \"%.50s\"\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, fuzzy, c-format
 #| msgid "NOTE: no default option file `%s'\n"
 msgid "Note: no default option file '%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, fuzzy, c-format
 #| msgid "option file `%s': %s\n"
 msgid "option file '%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1561,44 +1666,44 @@ msgstr "iconv_open başarısız: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, fuzzy, c-format
 #| msgid "error writing to `%s': %s\n"
 msgid "error writing to '%s': %s\n"
 msgstr "`%s' yazılırken hata: %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "bayat kilit dosyası siliniyor (%d tarafından oluşturulmuş)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kilit için bekleniyor (%d%s tarafından tutulmuş) %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(ölükilit?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, fuzzy, c-format
 #| msgid "lock `%s' not made: %s\n"
 msgid "lock '%s' not made: %s\n"
 msgstr "kilit `%s' yapılmadı: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "%s kilidi için bekleniyor...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s çok eski (gereken %s, sizinki %s)\n"
@@ -1844,23 +1949,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, 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:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, 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:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, 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:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1876,8 +1981,8 @@ msgstr "Bu komut sadece 2. sürüm kartlar için kullanılabilir\n"
 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:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1887,226 +1992,226 @@ msgstr "Seçiminiz? "
 msgid "[not set]"
 msgstr "[belirtilmedi]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Kart sahibinin soyadı: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Kart sahibinin adı: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, 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:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, 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:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "`%s' yazılırken hata: %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Hata: yanıt geçersiz.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hata: biçimli parmakizi geçersiz\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "anahtar işlemi mümkün değil: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, 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:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Mevcut anahtar deÄŸiÅŸtirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
 "      documentation of your card to see what sizes are allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1527
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, 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:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 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:1635
+#: g10/card-util.c:1645
 #, 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:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Mevcut anahtarlar deÄŸiÅŸtirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2121,174 +2226,174 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 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:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, 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:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, 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:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, 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:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "bunu gösterir"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "tüm kullanılabilir veriyi listeler"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "kart sahibinin ismini deÄŸiÅŸtirir"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "anahtarın alınacağı URL değiştirilir"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "kart URL'sinde belirtilmiş anahtarı alır"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "oturum açma ismini değiştirir"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "dil tercihlerini deÄŸiÅŸtirir"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "kart sahibinin cinsiyetini deÄŸiÅŸtirir"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "bir CA parmakizini deÄŸiÅŸtirir"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "imza zorlama PIN'i bayrağını değiştirir"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "yeni anahtarlar üretir"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "PIN'i değiştirme veya engelleme menüsü"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "PIN'i doğrular ve tüm veriyi listeler"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "Bir Sıfırlama Kodu kullanarak PIN'in engelini kaldır"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "`%s' açılamadı\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2351,8 +2456,8 @@ msgid "subkey"
 msgstr "GenAnah: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
@@ -2392,27 +2497,27 @@ msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
 msgid "using cipher %s\n"
 msgstr "%s şifrelemesi kullanılıyor\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, fuzzy, c-format
 #| msgid "WARNING: `%s' is an empty file\n"
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgid "digest algorithm '%s' may not be used in %s mode\n"
@@ -2438,7 +2543,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2447,40 +2558,40 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) sıkıştırma algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ÅŸifreli veri\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile ÅŸifrelenmiÅŸ\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "UYARI: ileti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "ÅŸifreli paketin elde edilmesinde sorun var\n"
@@ -2677,229 +2788,289 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "bir imza yapar"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "veriyi ÅŸifreler"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik ÅŸifre ile ÅŸifreler"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "anahtar parolası değiştirir"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "ileti özetlerini gösterir"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|İSİM|İSİM kullanıcısı için de şifreleme yapar"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|BELİRTİM|eposta rumuzlarını ayarlar"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "kesin OpenPGP davranışı etkin olur"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "hiçbir değişiklik yapmaz"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "üzerine yazmadan önce sorar"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the input"
+msgstr "Güvenliği denetleyen seçenekler"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+#, fuzzy
+#| msgid "Options controlling the diagnostic output"
+msgid "Options controlling the output"
+msgstr "Tanı çıktısını denetleyen seçenekler"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|DOSYA|çıktı DOSYAya yazılır"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr ""
-"|KULLANICI-KİMLİĞİ|imzalamak ya da şifre çözmek için KULLANICI-KİMLİĞİ "
-"kullanılır"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 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:587
-msgid "use canonical text mode"
-msgstr "kurallı metin kipini kullanır"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+#, fuzzy
+#| msgid "Options controlling the interactivity and enforcement"
+msgid "Options controlling key import and export"
+msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|DOSYA|çıktı DOSYAya yazılır"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
+"|MEKANİZMALAR|anahtarları eposta adreslerine göre konumlamak için "
+"MEKANİZMALAR kullanılır"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "hiçbir değişiklik yapmaz"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "dirmngr'a tüm erişim iptal edilir"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "üzerine yazmadan önce sorar"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+#, fuzzy
+#| msgid "Options controlling the configuration"
+msgid "Options controlling key listings"
+msgstr "Yapılandırmayı denetleyen seçenekler"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "kesin OpenPGP davranışı etkin olur"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "gizli anahtarları listeler"
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr ""
+"|KULLANICI-KİMLİĞİ|imzalamak ya da şifre çözmek için KULLANICI-KİMLİĞİ "
+"kullanılır"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2907,7 +3078,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2937,13 +3108,13 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2958,7 +3129,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2966,82 +3137,82 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Åžifre: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, 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:1627
+#: g10/gpg.c:1653
 #, 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:1630
+#: g10/gpg.c:1656
 #, 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:1636
+#: g10/gpg.c:1662
 #, 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:1639
+#: g10/gpg.c:1665
 #, 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:1642
+#: g10/gpg.c:1668
 #, 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:1648
+#: g10/gpg.c:1674
 #, 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:1651
+#: g10/gpg.c:1677
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3049,19 +3220,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:1654
+#: g10/gpg.c:1680
 #, 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:1660
+#: g10/gpg.c:1686
 #, 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:1663
+#: g10/gpg.c:1689
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3070,479 +3241,479 @@ 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:1666
+#: g10/gpg.c:1692
 #, 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:1882
+#: g10/gpg.c:1908
 #, 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:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 #, 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:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 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:2022
+#: g10/gpg.c:2025
 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:2024
+#: g10/gpg.c:2027
 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:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, 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:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, 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:3086
+#: g10/gpg.c:3085
 #, 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:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, 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:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, 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:3178
+#: g10/gpg.c:3177
 #, 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:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 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:3283
+#: g10/gpg.c:3282
 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:3285
+#: g10/gpg.c:3284
 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:3287
+#: g10/gpg.c:3286
 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:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "imzaların güvenilirliğini geçerli PKA verisi ile yükseltir"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, 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:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, 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:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BÄ°LGÄ°: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özet tercihleri geçersiz\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, 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:4127
+#: g10/gpg.c:4125
 #, 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:4199
+#: g10/gpg.c:4197
 #, 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:4228
+#: g10/gpg.c:4226
 #, 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:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, 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:4697
+#: g10/gpg.c:4695
 #, 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:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, 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:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, 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:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
@@ -3555,7 +3726,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:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
@@ -4294,7 +4465,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
@@ -4475,8 +4646,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:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
@@ -4689,7 +4860,7 @@ msgstr ""
 "  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
 "(ltsign, tnrsign gibi).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
@@ -4741,7 +4912,7 @@ msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
 
@@ -4830,178 +5001,178 @@ msgstr "DeÄŸiÅŸiklikler kaydedilecek mi? (e/H ya da y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "parmakizi geçersiz"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 #| msgid "failed to get the fingerprint\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "parmakizinin alınması başarısız oldu\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "değer hatalı\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 #, fuzzy
 #| msgid "Nothing to sign with key %s\n"
 msgid "Nothing to sign.\n"
 msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "parmakizi geçersiz"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Özet: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu deÄŸiÅŸmez"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Simgelemler: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr ""
 "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
 "kaldırılmış\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "oluÅŸturuldu: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmiÅŸti"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5009,17 +5180,17 @@ msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5029,18 +5200,18 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini saÄŸlayabilirsiniz.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5049,35 +5220,35 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 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:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doÄŸru imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5085,20 +5256,20 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d imza silindi.\n"
 msgstr[1] "%d imza silindi.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "geçersiz"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "kullanıcı kimliği \"%s\" yoğun: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5106,17 +5277,17 @@ msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 msgstr[1] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kullanıcı kimliği \"%s\": zaten küçük\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5126,50 +5297,50 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
 "ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
 "olarak atanamaz\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
 "kullanamazsınız\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
 "       kullanılamaz!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5180,183 +5351,183 @@ msgstr ""
 "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "yardımcı anahtar %s imzalamıyor, dolayısıyla çapraz sertifikalı olması "
 "gerekmiyor\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiÄŸiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 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:5344
+#: g10/keyedit.c:5400
 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:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Devam? (e/H ya da y/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%s çittirmeli kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, 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:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, 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:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 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:5966
+#: g10/keyedit.c:6022
 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:6026
+#: g10/keyedit.c:6082
 #, 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:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, 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:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 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:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, 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:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, 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:6511
+#: g10/keyedit.c:6567
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5841,7 +6012,7 @@ msgstr ""
 "üretecine yardımcı olur. \n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
@@ -5915,11 +6086,11 @@ msgstr "yazılabilir bir genel anahtar zinciri yok: %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:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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"
@@ -5927,14 +6098,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:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, 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:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5942,24 +6113,24 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, 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:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, 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:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, 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:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
@@ -6176,271 +6347,271 @@ msgstr "%s anahtarı %s adresinden isteniyor\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s şifreli oturum anahtarı\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "bilinmeyen özet algoritması ile üretilmiş anahtar parolası %d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla ÅŸifreli veri: doÄŸru DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
 "oluÅŸturuldu\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, 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:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "UYAR: çok sayıda salt metin görüldü\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, 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:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, 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:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: ÅŸifreli ileti tahrip edilmiÅŸ!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, 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:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, 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:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "hiç imza yok\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "imza doÄŸrulama engellendi\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu belirsiz imza verisi elde edilemiyor\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Ä°mza %s de\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, 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:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, 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:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritma: %s"
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ä°mza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, 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:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
@@ -6510,72 +6681,72 @@ msgstr "`%s' için okuma hatası: %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "UYARI: \"%s\" komutu artık önerilmiyor - kullanmayın onu\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, fuzzy, c-format
 #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, fuzzy, c-format
 #| msgid "ambiguous option `%s'\n"
 msgid "ambiguous option '%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown option '%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, fuzzy, c-format
 #| msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "DSA sekizin katlarında bir çittirim uzunluğu gerektirir\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6611,23 +6782,23 @@ msgstr "standart çıktıya yazıyor\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Kritik imza simgelemi: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -7067,12 +7238,12 @@ msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Bilginize: anahtar %s %s özelliğine sahip değil\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Bilginize: anahtar %s %s için bir tercihe sahip değil\n"
@@ -7521,7 +7692,7 @@ msgstr "atlandı: gizli anahtar zaten var\n"
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
@@ -7569,7 +7740,7 @@ msgstr "`%s' deki güvence kaydını ararken hata: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "`%s' için okuma hatası: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
@@ -8092,96 +8263,96 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' geçerli bir anahtar kimliği değil\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "anahtar %s: güvenli anahtar olarak kabul edildi\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "anahtar %s güvence veritabanında birden fazla görünüyor\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "anahtar %s: güvenli anahtar için genel anahtar yok - atlandı\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "anahtar %s son derece güvenli olarak imlendi.\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "güvence veritabanı kaydı %lu, istek tipi %d: okuma başarısız: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "güvence veritabanının %lu. kaydı %d istek türünde değil\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr ""
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "bilinmeyen güvence modeli (%d) kullanılamıyor - %s güvence modeli "
 "varsayılıyor\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s güvence modeli kullanılıyor\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, fuzzy, c-format
 #| msgid "no need for a trustdb check with `%s' trust model\n"
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, fuzzy, c-format
 #| msgid "no need for a trustdb update with `%s' trust model\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "genel anahtar %s yok: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8189,7 +8360,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:2007
+#: g10/trustdb.c:2050
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8197,17 +8368,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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, 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:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8215,29 +8386,29 @@ msgstr ""
 "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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"
 
@@ -8249,43 +8420,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   ]"
 
@@ -8337,35 +8508,35 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 #, 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:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz"
@@ -8433,7 +8604,7 @@ msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 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:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
@@ -8501,7 +8672,7 @@ msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
@@ -8650,13 +8821,13 @@ msgstr "kart %s özet algoritmasını desteklemiyor\n"
 msgid "signatures created so far: %lu\n"
 msgstr "ÅŸu ana kadar oluÅŸturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, 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:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -8674,60 +8845,60 @@ msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
 msgid "|N|Initial New PIN"
 msgstr "|N|Ä°lk Yeni PIN"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "çoklu sunucu kipinde çalışır (önalanda)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|DOSYA|DOSYAya bir günce yazar"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|N. porttaki okuyucuya bağlanır"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|İSİM|ct-API sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|İSİM|PC/SC sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "dahili CCID sürücüsü kullanılmaz"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|N saniyelik durgunluktan sonra kartı ayırır"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 #, fuzzy
 #| msgid "do not use a reader's keypad"
 msgid "do not use a reader's pinpad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:170
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:179
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "yönetici kartı komutları kullanımına izin verir"
 
-#: scd/scdaemon.c:163
-msgid "use variable length input for pinpad"
-msgstr ""
-
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:326
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 #, fuzzy
 #| msgid ""
 #| "Syntax: scdaemon [options] [command [args]]\n"
@@ -8739,7 +8910,7 @@ msgstr ""
 "Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
 "GnuPG için akıllı kart artalan süreci\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, fuzzy, c-format
 #| msgid ""
 #| "please use the option `--daemon' to run the program in the background\n"
@@ -8748,16 +8919,22 @@ msgstr ""
 "Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
 "kullanın\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d için eylemci başlatıldı\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8817,7 +8994,7 @@ msgstr "harici bir sertifikacı arar\n"
 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:723 dirmngr/ocsp.c:685
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
@@ -8978,7 +9155,7 @@ msgstr "kök sertifika güvenilir olarak imli değil"
 msgid "checking the trust list failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "sertifika zinciri çok uzun\n"
@@ -9032,7 +9209,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u bitlik çittirim %u bitlik %s anahtarı için geçersiz\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -9043,7 +9220,7 @@ msgstr "nüve dışında\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(bu, MD2 algoritmasıdır)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "yok"
 
@@ -9078,46 +9255,41 @@ msgstr ""
 "S/N: %s, Kimlik: 0x%08lX,\n"
 "oluşturuluşu: %s, süre bitimi: %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "hiç anahtar kullanımı belirtilmemiş - tüm kullanımlar var sayılıyor\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "anahtar kullanım bilgisi alınırken hata: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for certification\n"
 msgid "certificate should not have been used for certification\n"
 msgstr "sertifika onaylama için kullanılmamalıydı\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "sertifika, OCSP yanıtının imzalanması için kullanılmamalıydı\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for encryption\n"
 msgid "certificate should not have been used for encryption\n"
 msgstr "sertifika şifreleme için kullanılmamalıydı\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for signing\n"
 msgstr "sertifika imzalama için kullanılmamalıydı\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "sertifika şifreleme için elverişli değil\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "sertifika imzalama için elverişli değil\n"
@@ -9324,6 +9496,11 @@ msgstr ""
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "geçici dosya oluşturulurken hata: %s\n"
+
 #: sm/certreqgen-ui.c:438
 #, fuzzy
 #| msgid "self-signed certificate has a BAD signature"
@@ -9408,127 +9585,127 @@ msgstr "\"%s\" sertifikası silinemedi: %s\n"
 msgid "no valid recipients given\n"
 msgstr "geçerli alıcılar verilmedi\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "harici anahtarları listeler"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "sertifika zincirini listeler"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "sertifikaları ithal eder"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "sertifikaları ihraç eder"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "bir akıllı kartı kayda alır"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-tool'u çalıştırır"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "base-64 kodlu çıktı oluşturur"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "terminali hiç kullanma"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|içerilecek sertifika sayısı"
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "girdinin PEM biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "girdinin ikilik biçimde olduğu kabul edilir"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "base-64 kodlu çıktı oluşturur"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr ""
+"|KULLANICI-KİMLİĞİ|öntanımlı gizli anahtar olarak KULLANICI-KİMLİĞİ "
+"kullanılır"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|DOSYA|anahtar zincirini anahtar zincirleri listesine ekler"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "kayıp sertifikacı sertifikalarını alır"
+
+#: sm/gpgsm.c:354
+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:372
 msgid "never consult a CRL"
 msgstr "asla bir CRL sormaz"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "kök sertifikalar için CRLler sınanmaz"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "doğruluğu OCSP kullarak sınar"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|içerilecek sertifika sayısı"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "sertifika poliçeleri sınanmaz"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "kayıp sertifikacı sertifikalarını alır"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "terminali hiç kullanma"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|DOSYA|bir sunucu kipi günlüğü DOSYAya yazar"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|DOSYA|bir denetim günlüğünü DOSYAya yazar"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|İSİM|özet algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|DOSYA|anahtar zincirini anahtar zincirleri listesine ekler"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr ""
-"|KULLANICI-KİMLİĞİ|öntanımlı gizli anahtar olarak KULLANICI-KİMLİĞİ "
-"kullanılır"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-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:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|İSİM|özet algoritması olarak İSİM kullanılır"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|DOSYA|bir denetim günlüğünü DOSYAya yazar"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 #, 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:580
+#: sm/gpgsm.c:606
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm [options] [files]\n"
@@ -9543,31 +9720,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:788
+#: sm/gpgsm.c:814
 #, 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:799
+#: sm/gpgsm.c:825
 #, 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:1619
+#: sm/gpgsm.c:1666
 #, 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:1662
+#: sm/gpgsm.c:1709
 #, 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:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
@@ -9627,7 +9804,7 @@ msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "bayraklar saklanırken hata: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Hata - "
 
@@ -9664,7 +9841,7 @@ msgstr ""
 "\n"
 "%s%sBunu yapmak istediÄŸinizden emin misiniz?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9716,23 +9893,23 @@ msgstr "[belirtilmeyen tarihte]"
 msgid "algorithm:"
 msgstr "algoritma: %s"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr "geçersiz imza: ileti özeti özelliği hesaplananla uyuşmuyor\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Buradaki imzeler iyi:"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "        nam-ı diğer"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Bu bir nitelikli imzadır.\n"
@@ -10608,126 +10785,147 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 #, 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:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "shutdown the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
-
-#: dirmngr/dirmngr.c:195
-#, fuzzy
-#| msgid "Quit without saving? (y/N) "
-msgid "run without asking a user"
-msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:197
-#, fuzzy
-#| msgid "allow PKA lookups (DNS requests)"
-msgid "allow sending OCSP requests"
-msgstr "PKA aramalarına izin verilir (DNS istekleri)"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
-msgid "inhibit the use of HTTP"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "Anahtar sunucular için yapılandırma"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr "HTTP sunucuları için yapılandırma"
+
+#: dirmngr/dirmngr.c:249
+msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
+#: dirmngr/dirmngr.c:253
+msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "sistemin HTTP vekil ayarları kullanılır"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "Kullanılacak LDAP sunucularının yapılandırması"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:210
-msgid "|URL|redirect all HTTP requests to URL"
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|BELİRTİM|anahtarları aramak için bu anahtar sunucusu kullanılır"
+
+#: dirmngr/dirmngr.c:271
 #, fuzzy
 #| msgid "|FILE|read options from FILE"
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 #, 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:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "OCSP için yapılandırma"
+
+#: dirmngr/dirmngr.c:281
+#, fuzzy
+#| msgid "allow PKA lookups (DNS requests)"
+msgid "allow sending OCSP requests"
+msgstr "PKA aramalarına izin verilir (DNS istekleri)"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr ""
+
+#: dirmngr/dirmngr.c:285
 #, 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:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
-msgstr ""
-
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr ""
-
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10740,13 +10938,13 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 #, 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:427
+#: dirmngr/dirmngr.c:461
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -10758,92 +10956,92 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, 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:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] "
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, 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:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, 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:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "parmakizi geçersiz"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, 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:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "zorlanmadı"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
@@ -11054,103 +11252,103 @@ msgstr "güvence listesinin sınanması başarısız: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 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:540 dirmngr/ocsp.c:727
 #, 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:587
 #, 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:626 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:636
 #, 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:643
 #, 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:653
 #, 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:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, 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:705
 #, 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:710
 #, 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:767
 #, 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:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, 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:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11161,76 +11359,76 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "satır göndirimi başarısız: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire failed: %s\n"
 msgstr "satır göndirimi başarısız: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, 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:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, 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:1720
+#: dirmngr/server.c:1727
 #, 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:1753
+#: dirmngr/server.c:1760
 #, 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:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, 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:2977
+#: dirmngr/server.c:2984
 #, 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:2998
+#: dirmngr/server.c:3005
 #, 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:3006
+#: dirmngr/server.c:3013
 #, 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:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11282,7 +11480,7 @@ msgstr "sertifika iyi durumda\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "sertifika imzalama için kullanılmamalıydı\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "sessiz"
 
@@ -11386,308 +11584,154 @@ msgstr "satır göndirimi başarısız: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "standart seçenekler gönderilirken hata: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Tanı çıktısını denetleyen seçenekler"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Yapılandırmayı denetleyen seçenekler"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Hata ayıklamaya elverişli seçenekler"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Güvenliği denetleyen seçenekler"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|SSH anahtarları N saniyede zamanaşımına uğrar"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|azami SSH anahtarı ömrü N saniyeye ayarlanır"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "anahtar parolası kuralının atlanmasına izin verilmez"
-
-#: tools/gpgconf-comp.c:576
-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"
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
+#: tools/gpgconf-comp.c:625
+msgid "OpenPGP"
 msgstr ""
-"|N|yeni bir anahtar parolası için en azından harf olmayan N karakter gerekir"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|DOSYA|yeni anahtar parolası DOSYAdaki kalıba göre sınanır"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|anahtar parolası N gün sonra zaman aşımına uğrar"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
-
-#: tools/gpgconf-comp.c:596
-#, 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"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|İSİM|İSİM kullanıcısı için de şifreleme yapar"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|BELİRTİM|eposta rumuzlarını ayarlar"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "Anahtar sunucular için yapılandırma"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "PKA aramalarına izin verilir (DNS istekleri)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-"|MEKANİZMALAR|anahtarları eposta adreslerine göre konumlamak için "
-"MEKANİZMALAR kullanılır"
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "anahtarları bir anahtar sunucusundan indirir"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-#| msgid "list and check key signatures"
-msgid "include the public key in signatures"
-msgstr "anahtar imzalarını listeler ve sınar"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "dirmngr'a tüm erişim iptal edilir"
-
-#: tools/gpgconf-comp.c:838
-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"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "kök sertifikalar için CRLler sınanmaz"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Çıktı biçimini denetleyen seçenekler"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
-
-#: tools/gpgconf-comp.c:978
-#, fuzzy
-#| msgid "Options controlling the security"
-msgid "Options controlling the use of Tor"
-msgstr "Güvenliği denetleyen seçenekler"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "HTTP sunucuları için yapılandırma"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "sistemin HTTP vekil ayarları kullanılır"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "Kullanılacak LDAP sunucularının yapılandırması"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "LDAP sunucu listesi"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "OCSP için yapılandırma"
-
-#: tools/gpgconf-comp.c:1098
-msgid "OpenPGP"
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr ""
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 #| msgid "Bad Passphrase"
 msgid "Passphrase Entry"
 msgstr "Anahtar Parolası hatalı"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 #, fuzzy
 #| msgid "Component not found"
 msgid "Component not suitable for launching"
 msgstr "BileÅŸen yok"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, 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:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, 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:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Grup belirtimlerinin yoksayıldığına dikkat edin\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, 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:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
 msgstr "'%s' de hata: %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "tüm bileşenleri listeler"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "tüm programları sınar"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|BİLEŞEN|seçenekleri listeler"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|BİLEŞEN|seçenekleri değiştirir"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|BİLEŞEN|seçenekleri sınar"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "öntanımlı küresel değerleri uygular"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 #, fuzzy
 #| msgid "|FILE|take policy information from FILE"
 msgid "|FILE|update configuration files using FILE"
 msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 #, fuzzy
 #| msgid "get the configuration directories for gpgconf"
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "gpgconf için yapılandırma dizinlerini getirir"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "küresel yapılandırma dosyasını listeler"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "küresel yapılandırma dosayasını sınar"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "güvence veritabanını günceller"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 #, fuzzy
 #| msgid "list all components"
 msgid "reload all or a given component"
 msgstr "tüm bileşenleri listeler"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 #, fuzzy
 #| msgid "list all components"
 msgid "launch a given component"
 msgstr "tüm bileşenleri listeler"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 #, fuzzy
 #| msgid "list all components"
 msgid "kill a given component"
 msgstr "tüm bileşenleri listeler"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "mümkünse değişiklikleri çalışma sırasında etkin kılar"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgconf [options]\n"
@@ -11699,15 +11743,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:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Tek bileÅŸenlik deÄŸiÅŸtirge gerekli"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "BileÅŸen yok"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "DeÄŸiÅŸtirgeye izin verilmez"
 
@@ -11725,6 +11769,44 @@ msgstr ""
 "Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
 "karşılaştırır\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "geçeci dosyaya yazma hatası: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "sunucu için bir günlük dosyası kullanılır"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|DOSYA|bir sunucu kipi günlüğü DOSYAya yazar"
+
+#, fuzzy
+#~| msgid "Quit without saving? (y/N) "
+#~ msgid "run without asking a user"
+#~ msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "PKA aramalarına izin verilir (DNS istekleri)"
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "anahtarları bir anahtar sunucusundan indirir"
+
+#, fuzzy
+#~| msgid "list and check key signatures"
+#~ msgid "include the public key in signatures"
+#~ msgstr "anahtar imzalarını listeler ve sınar"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "Çıktı biçimini denetleyen seçenekler"
+
+#, fuzzy
+#~| msgid "Options controlling the security"
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Güvenliği denetleyen seçenekler"
+
+#~ msgid "LDAP server list"
+#~ msgstr "LDAP sunucu listesi"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
 
@@ -11882,9 +11964,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "%s yazmak için açılamadı: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "%s yazılırken hata: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "%s okunurken hata: %s\n"
 
@@ -12049,9 +12128,6 @@ msgstr ""
 #~ msgid "listen() failed: %s\n"
 #~ msgstr "soket dinleme başarısız: %s\n"
 
-#~ msgid "do not grab keyboard and mouse"
-#~ msgstr "klavye ve fare gaspedilmez"
-
 #~ msgid "Error: URL too long (limit is %d characters).\n"
 #~ msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
 
diff --git a/po/uk.gmo b/po/uk.gmo
index 70e234a..d6261f7 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index 8f97803..440b769 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -143,8 +143,8 @@ msgstr "Пінкод:"
 msgid "Passphrase:"
 msgstr "Пароль:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "паролі не збігають��, повторіть �пробу"
 
@@ -189,63 +189,93 @@ msgstr "Помилковий пінкод"
 msgid "Bad Passphrase"
 msgstr "Помилковий пароль"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "помилка під ча� �проби отриманн� �ерійного номера картки: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "Будь ла�ка, повторіть введенн� парол�"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase to protect the imported object within the "
+#| "GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr ""
+"Будь ла�ка, введіть пароль дл� захи�ту імпортованого об’єкта у �и�темі GnuPG."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 "підтримки ключів ssh, що �кладають�� з понад %d бітів, не передбачено\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "не вдало�� �творити «%s»: %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "не вдало�� відкрити «%s»: %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "помилка під ча� �проби отриманн� �ерійного номера картки: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "ви�влено картку з �ерійним номером: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "на карті немає ключа розпізнаванн� дл� SSH: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "не ви�влено відповідних ключів картки: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "помилка під ча� �проби отриманн� �пи�ку карток: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -254,24 +284,20 @@ msgstr ""
 "Проце�ом ssh наді�лано запит щодо викори�танн� ключа%%0A  %s%%0A  "
 "(%s)%%0A�адати до�туп до цього ключа?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "�адати"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "Заборонити"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Будь ла�ка, вкажіть пароль до ключа ssh%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "Будь ла�ка, повторіть введенн� парол�"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -280,97 +306,93 @@ msgstr ""
 "Будь ла�ка, вкажіть пароль дл� захи�ту отриманого закритого ключа%%0A   %s"
 "%%0A   %s%%0Aу �ховищі ключів gpg-agent"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "не вдало�� �творити потік даних з �окета: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "Будь ла�ка, в�тавте картку з �ерійним номером"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "Будь ла�ка, вийміть поточну картку і в�тавте картку з �ерійним номером"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "�дміні�тративний пінкод"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "Код �киданн�"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0AСкори�тайте�� додатковою клавіатурою зчитувача дл� введенн�."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "Повторіть введенн� цього коду �киданн�"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "Повторіть введенн� цього PUK"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "Повторіть введенн� цього пінкоду"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Помилка під ча� повторного введенн� коду �киданн�, повторіть �пробу"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "Помилка під ча� повторного введенн� PUK, повторіть �пробу"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "Помилка під ча� повторного введенн� пінкоду, повторіть �пробу"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Будь ла�ка, введіть пінкод%s%s%s дл� розблокуванн� картки"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "помилка �творенн� тимча�ового файла: %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "помилка під ча� �проби запи�у до тимча�ового файла: %s\n"
+#: agent/genkey.c:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "помилка під ча� запи�у до %s: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "Вкажіть новий пароль"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "Скори�тати�� цим"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Вами не вказано парол�!%0AВикори�танн� порожніх паролів заборонено."
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -379,11 +401,11 @@ msgstr ""
 "Вами не вказано парол�. Цього не варто робити!%0AБудь ла�ка, підтвердіть, що "
 "ваш ключ не �лід захищати взагалі."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "Так, у захи�ті немає потреби"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -391,7 +413,7 @@ msgstr[0] "Пароль має Ñ�кладатиÑ�Ñ� принаймні з %u Ñ�Ð
 msgstr[1] "Пароль має �кладати�� принаймні з %u �имволів."
 msgstr[2] "Пароль має �кладати�� принаймні з %u �имволів."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:282
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -400,159 +422,231 @@ msgstr[0] "У паролі має бути принаймні %u цифра аб
 msgstr[1] "У паролі має бути принаймні %u цифри або%%0A�пеціальних �имволи."
 msgstr[2] "У паролі має бути принаймні %u цифр або%%0A�пеціальних �имволів."
 
-#: agent/genkey.c:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Паролем не повинно бути �лово зі �ловника або �лово%%0A, що відповідає "
 "певному зразку."
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Попередженн�: вами вказано не�кладний пароль."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Вкажіть пароль до%0Aз метою захи�ту вашого нового ключа"
 
-#: agent/genkey.c:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "Вкажіть новий пароль"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@Параметри:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+#, fuzzy
+#| msgid "Options useful for debugging"
+msgid "Options used for startup"
+msgstr "Параметри діагно�тики"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "запу�тити у режимі фонової �лужби (фоновий)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "запу�тити у режимі �ервера (о�новному)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr "запу�тити у режимі із нагл�дом"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "докладний режим"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "дещо зменшити кількі�ть повідомлень"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "не від’єднувати від кон�олі"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "виведенн� команд у форматі sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "виведенн� команд у форматі csh"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|прочитати параметри з вказаного файла"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "не від’єднувати від кон�олі"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "Параметри керуванн� діагно�тичним виводом"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "викори�товувати файл журналу дл� �ервера"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "докладний режим"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|викори�товувати вказану програму пінзапи�ів"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "дещо зменшити кількі�ть повідомлень"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|викори�товувати вказану програму SCdaemon"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|запи�увати журнал режиму �ервера до файла"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "Параметри керуванн� налаштуванн�ми"
+
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "не викори�товувати SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|викори�товувати вказану програму SCdaemon"
+
+#: agent/gpg-agent.c:213
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|приймати певні команди через NAME"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "ігнорувати запити щодо зміни TTY"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "ігнорувати запити щодо зміни графічного ди�пле�"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "увімкнути підтримку ssh"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|�ЛГО|викори�тати алгоритм �ЛГО дл� показу відбитків ssh"
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "увімкнути підтримку putty"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "Параметри керуванн� захи�том"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|вважати кешовані пінкоди за вказану кількі�ть �екунд"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|завершувати �трок дії ключів SSH за N �екунд"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|в�тановити мак�имальний �трок дії кешу пінкодів у �екундах"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|в�тановити мак�имальний �трок дії ключа SSH у �екундах"
+
+#: agent/gpg-agent.c:248
 msgid "do not use the PIN cache when signing"
 msgstr "не викори�товувати кеш пін-кодів дл� підпи�уванн�"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:250
 msgid "disallow the use of an external password cache"
 msgstr "заборонити викори�танн� зовнішнього кешу паролів"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "заборонити клієнтам позначати ключі �к надійні"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 msgid "allow presetting passphrase"
 msgstr "дозволити попереднє в�тановленн� парол�"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "Параметри приму�ового викори�танн� правил паролів"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "не дозвол�ти обхід правил паролів"
+
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|в�тановити вказану мінімальну довжину нових паролів"
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|N|вимагати у нових парол�х не менше вказаної кілько�ті нелітер"
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|перевір�ти нові паролі за зразком з вказаного файла"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|завершувати �трок дії паролів за вказану кількі�ть днів"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "не дозвол�ти повторне викори�танн� �тарих паролів"
+
+#: agent/gpg-agent.c:281
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the PIN-Entry"
+msgstr "Параметри керуванн� захи�том"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
+msgstr ""
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr "заборонити функції виклику перевизначати pinentry"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
-msgstr "дозволити запит парол� з Emacs"
+#: agent/gpg-agent.c:287
+#, fuzzy
+#| msgid "do not grab keyboard and mouse"
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr "не захоплювати керуванн� клавіатурою і мишею"
 
-#: agent/gpg-agent.c:258
-msgid "enable ssh support"
-msgstr "увімкнути підтримку ssh"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|викори�товувати вказану програму пінзапи�ів"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "|�ЛГО|викори�тати алгоритм �ЛГО дл� показу відбитків ssh"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|в�тановити вказаний ча� очікуванн� Pinentry у �екундах"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "увімкнути підтримку putty"
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Будь ла�ка, над�илайте повідомленн� про помилки на <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Викори�танн�: @GPG_AGENT@ [параметри] (-h — довідка)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -560,137 +654,145 @@ msgstr ""
 "Синтак�и�: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
 "Керуванн� закритими ключами у @GNUPG@\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "вказано некоректне значенн� рівн� діагно�тики «%s»\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "вибраний алгоритм побудови контрольних �ум є некоректним\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "прочитати параметри з «%s»\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "З�УВ�ЖЕ��Я: %s не призначено дл� звичайного викори�танн�!\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не вдало�� �творити �окет: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "назва �окета «%s» є надто довгою\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent вже запущено, потреби у запу�ку нової копії немає\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "помилка під ча� �проби отриманн� поточного �тану �окета\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "помилка під ча� �проби прив’�зуванн� �окета до «%s»: %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "не вдало�� в�тановити права до�тупу до «%s»: %s\n"
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "очікуванн� даних на �океті «%s»\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "не вдало�� �творити каталог «%s»: %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "�творено каталог «%s»\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "помилка stat() щодо «%s»: %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "не можна викори�товувати �к домашній каталог «%s»\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 "помилка під ча� �проби читанн� поточного �тану на файловому де�крипторі %d: "
 "%s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "запущено обробки 0x%lx дл� файлового де�криптора %d\n"
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "обробник 0x%lx де�криптора файла %d завершив роботу\n"
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "запущено обробник ssh 0x%lx дл� де�криптора файла %d\n"
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "обробник ssh 0x%lx де�криптора файла %d завершив роботу\n"
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "помилка pth_select: %s — очікуванн� у 1 �\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s зупинено\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "у цьому �еан�і не запущено gpg-agent\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Параметри:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr ""
@@ -704,8 +806,8 @@ msgstr ""
 "Синтак�и�: gpg-preset-passphrase [параметри] KEYGRIP\n"
 "Керуванн� кешем паролів\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -713,9 +815,8 @@ msgstr ""
 "@Команди:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -770,43 +871,43 @@ msgstr "�ка�овано\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "помилка під ча� �проби запиту парол�: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "помилка під ча� відкритт� «%s»: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "файл «%s», р�док %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "проігноровано ін�трукцію «%s» у «%s», р�док %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "�пи�ок довіри �и�теми «%s» недо�тупний\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "помилковий відбиток у «%s», р�док %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "некоректна позначка ключа у «%s», р�док %d\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "помилка під ча� читанн� «%s», р�док %d: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "помилка під ча� читанн� �пи�ку надійних кореневих �ертифікатів\n"
@@ -819,7 +920,7 @@ msgstr "помилка під чаÑ� читаннÑ� Ñ�пиÑ�ку надійниÑ
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -828,11 +929,11 @@ msgstr ""
 "Бажаєте в�тановити аб�олютний рівень довіри до%%0A  «%s»%%0Aз метою належної "
 "�ертифікації �ертифікатів кори�тувача?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Так"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "�і"
@@ -845,7 +946,7 @@ msgstr "�і"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -857,21 +958,21 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "Підтверджую"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "�е підтверджую"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Зауваженн�: цей пароль ще не змінював��.%0AБудь ла�ка, змініть його зараз."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -880,15 +981,15 @@ msgstr ""
 "Цей пароль не змінював��%%0Aз %.4s-%.2s-%.2s.  Будь ла�ка, змініть його "
 "зараз."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "Змінити пароль"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "Я зміню його пізніше"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -896,11 +997,11 @@ msgid ""
 msgstr ""
 "Справді хочете вилучити ключ, що визначаєть�� keygrip%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "Вилучити ключ"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -934,7 +1035,7 @@ msgstr "невдала �проба перевірити �творений пі
 msgid "secret key parts are not available\n"
 msgstr "закриті ча�тини ключа недо�тупні\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr ""
@@ -950,53 +1051,53 @@ msgstr "підтримки алгоритму захи�ту %d (%s) не пер
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "підтримки алгоритму захи�ту хешуванн�м %d (%s) не передбачено\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "помилка під ча� �проби �творенн� каналу: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "помилка під ча� �проби �творенн� потоку дл� каналу: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "помилка під ча� �проби розгалужуванн� проце�у: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "не вдало�� дочекати�� завершенн� проце�у %d: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr ""
 "помилка під ча� �проби виконанн� «%s»: ймовірно, програму не в�тановлено\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "помилка під ча� �проби виконанн� «%s»: �тан виходу %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "помилка під ча� �проби виконанн� «%s»: виконанн� перервано\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "не вдало�� дочекати�� перериванн� проце�у: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "помилка під ча� �проби отриманн� коду виходу проце�у %d: %s\n"
@@ -1026,12 +1127,12 @@ msgstr "Увага: визначенн� вла�ника не є безпечн
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Увага: визначенн� прав до�тупу не є безпечним дл� %s — «%s»\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "очікуємо на отриманн� до�тупу до файла «%s»…\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "�проба перейменуванн� «%s» на «%s» зазнала невдачі: %s\n"
@@ -1092,22 +1193,22 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr "вихід за межі обла�ті під ча� �проби отриманн� %lu байтів"
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "помилка під ча� �проби розподілу пам’�ті: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: за�тарілий параметр «%s» — він не працюватиме\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "УВ�Г�: «%s%s» є за�тарілим параметром — він не працюватиме\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "невідомий прапорець діагно�тики «%s» проігноровано\n"
@@ -1415,7 +1516,7 @@ msgstr "некоректний параметр"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "не вказано аргументу до параметра «%.50s»\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "некоректний аргумент параметра «%.50s»\n"
@@ -1445,17 +1546,17 @@ msgstr "команда «%.50s» є неоднозначною\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "некоректний параметр «%.50s»\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "З�УВ�ЖЕ��Я: не ви�влено файла типових параметрів «%s»\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "файл параметрів «%s»: %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1475,41 +1576,41 @@ msgstr "помилка iconv_open: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "помилка перетворенн� з «%s» у «%s»: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "не вдало�� �творити тимча�овий файл «%s»: %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "помилка під ча� �проби запи�у до «%s»: %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "вилученн� за�тарілого файла блокуванн� (�творено %d)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "очікуванн� на блокуванн� (зайн�то %d%s) %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(за�таріле блокуванн�?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "блокуванн� «%s» не виконано: %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "очікуванн� на блокуванн� %s…\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s є занадто за�тарілою (потрібно %s, маємо %s)\n"
@@ -1743,23 +1844,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "�творити �ертифікат відкликанн�"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "формат ASCII: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "�е вдало�� отримати до�туп до картки OpenPGP: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Ви�влено картку OpenPGP з номером %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1775,8 +1876,8 @@ msgstr "Цією командою можна кори�тувати�� лише
 msgid "Reset Code not or not anymore available\n"
 msgstr "�емає коду �киданн� або код �киданн� вже недо�тупний\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1786,121 +1887,121 @@ msgstr "Ваш вибір? "
 msgid "[not set]"
 msgstr "[не в�тановлено]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "не увімкнено"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "увімкнено"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 "Помилка: у поточній вер�ії можна викори�товувати лише звичайний ASCII.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Помилка: �имвол «<» не можна викори�товувати.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Помилка: не можна викори�товувати подвійні пробіли.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "Прізвище вла�ника картки: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "Ім’� вла�ника картки: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Помилка: �кладена назва є занадто довгою (мак�имум — %d �имволів).\n"
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "�дре�а дл� отриманн� відкритого ключа: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "помилка під ча� �проби читанн� «%s»: %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "помилка під ча� �проби читанн� «%s»: %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "Дані кори�тувача (назва запи�у): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "О�оби�ті дані DO: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "О�новна мова: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "Помилка: некоректна довжина р�дка о�новної мови.\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Помилка: некоректні �имволи у р�дку о�новної мови.\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "Помилка: некоректна відповідь.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "Відбиток CA: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Помилка: некоректне форматуванн� відбитка.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "ді� над ключем неможлива: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "не є карткою OpenPGP"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "помилка під ча� отриманн� даних поточного ключа: %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "Замінити вже �творений ключ? (y/N або т/�) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1911,98 +2012,98 @@ msgstr ""
 "      ознайомте�� з документацією до вашої картки, щоб\n"
 "      визначити дозволені розміри.\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Якою має бути довжина ключа? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлено до %u бітів\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "Розміри ключів %s мають перебувати у діапазоні %u—%u\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr "Зміна атрибута ключа картки дл�: "
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 msgid "Signature key\n"
 msgstr "Ключ підпи�уванн�\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 msgid "Encryption key\n"
 msgstr "Ключ шифруванн�\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr "Ключ розпізнаванн�\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "Вкажіть потрібний вам тип ключа:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "�екоректний вибір.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "помилка під ча� �проби змінити атрибут ключа %d: %s\n"
 
-#: g10/card-util.c:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "помилка під ча� �проби отриманн� даних щодо картки: %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Цією карткою не передбачено підтримки вказаної команди\n"
 
-#: g10/card-util.c:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Створити резервну копію ключа шифруванн� поза карткою? (Y/n або Т/н) "
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "З�УВ�ЖЕ��Я: ключі вже збережено на картці!\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "Замірити вже �творені ключі? (y/N або т/�) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2013,170 +2114,170 @@ msgstr ""
 "   PIN = «%s»     �дміні�тративний PIN = «%s»\n"
 "Вам �лід змінити параметри за допомогою команди --change-pin\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 msgid "Please select the type of key to generate:\n"
 msgstr "Виберіть тип ключа, �кий �лід �творити:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ підпи�уванн�\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифруванн�\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ розпізнаванн�\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "Виберіть �ховище дл� зберіганн� ключа:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Помилка KEYTOCARD: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 "Зауваженн�: у результаті виконанн� цієї команди у�і ключі на картці буде "
 "знищено!\n"
 
-#: g10/card-util.c:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr "Продовжити? (y (так)/N (ні)) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 "Справді хочете �кинути у�е до типових налаштувань? (введіть «yes» («так»)) "
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "помилка налаштуванн� KDF: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "вийти з цього меню"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "показати керівні команди"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "показати цю довідкову інформацію"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "показати в�і до�тупні дані"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "змінити ім’� вла�ника картки"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "змінити адре�у дл� отриманн� ключа"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "отримати ключ, вказаний у полі адре�и картки"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "змінити ім’� кори�тувача"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "змінити о�новну мову"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "змінити поле �таті вла�ника картки"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "змінити відбиток CA"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "увімкнути або вимкнути позначку приму�ового пінкоду підпи�у"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "�творити ключі"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "меню зміни або розблокуванн� пінкоду"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "перевірити пінкод і показати �пи�ок в�іх даних"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "розблокувати під коду за допомогою коду �киданн�"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr "знищити у�і ключі і дані"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr "налаштуванн� KDF дл� розпізнаванн� за PIN"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 msgid "change the key attribute"
 msgstr "змінити атрибут ключа"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/картка> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "Команда адміні�тратора\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "Команди адміні�труванн� дозволено\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "Команди адміні�труванн� заборонено\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�екоректна команда  (�кори�тайте�� командою «help»)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output не працює з цією командою\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "не вдало�� відкрити «%s»\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ «%s» не знайдено: %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2235,8 +2336,8 @@ msgid "subkey"
 msgstr "підключ"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "помилка оновленн�: %s\n"
@@ -2277,24 +2378,24 @@ msgstr "не можна викори�товувати �иметричний п
 msgid "using cipher %s\n"
 msgstr "викори�тано шифр %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "«%s» вже �ти�нено\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "УВ�Г�: файл «%s» є порожнім\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм шифруванн� «%s» не можна викори�товувати у режимі %s\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2319,7 +2420,13 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "УВ�Г�: ключ %s не можна викори�товувати дл� шифруванн� у режимі %s\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2328,41 +2435,41 @@ msgstr ""
 "УВ�Г�: приму�ове викори�танн� алгоритму �ти�ненн� %s (%d) не відповідає "
 "параметрам отримувача\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "приму�ове викори�танн� �иметричного шифру %s (%d) не відповідає параметрам "
 "отримувача\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано дл� «%s»\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "параметр «%s» не можна викори�товувати у режимі %s\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "Дані, зашифровані за алгоритмом %s\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано за допомогою невідомого алгоритму %d\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "УВ�Г�: повідомленн� зашифровано �лабким ключем з �иметричним шифруванн�м.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "проблема з обробкою зашифрованого пакета\n"
@@ -2550,216 +2657,275 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "викори�товуємо підключ %s замі�ть о�новного ключа %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "коректні значенн� параметра «%s»:\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "�творити підпи�"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "�творити тек�товий підпи�"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "�творити від’єднаний підпи�"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "зашифрувати дані"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "шифрувати лише за допомогою �иметричного шифру"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "розшифрувати дані (типова ді�)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "перевірити підпи�"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "показати �пи�ок ключів"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "показати �пи�ок ключів і підпи�ів"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "показати �пи�ок і перевірити підпи�и ключів"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "показати �пи�ок ключів і відбитків"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "показати �пи�ок закритих ключів"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "�творити пару ключів"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "швидке �творенн� пари ключів"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr "швидке додаванн� нового ідентифікатора кори�тувача"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr "швидке відкликанн� ідентифікатора кори�тувача"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr "швидке в�тановленн� нової дати завершенн� �троку дії"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "повноцінне �творенн� пари ключів"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "�творити �ертифікат відкликанн�"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "вилучити ключі з відкритого �ховища ключів"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "вилучити ключів з закритого �ховища ключів"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "швидко підпи�ати ключ"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "швидко підпи�ати ключ локально"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "швидке відкликанн� ідентифікатора кори�тувача"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "підпи�ати ключ"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "підпи�ати ключ локально"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "підпи�ати або редагувати ключ"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "змінити пароль"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "ек�портувати ключі"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "ек�портувати ключі на �ервер ключів"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "імпортувати ключі з �ервера ключів"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "шукати ключі на �ервері ключів"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "оновити в�і ключів з �ервера ключів"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "імпортувати/об’єднати ключі"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "показати дані про �тан картки"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "змінити дані на картці"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "змінити пінкод картки"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "оновити базу даних довіри"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "показати контрольні �уми повідомлень"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "запу�тити у режимі �ервера"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|в�тановити вказане правило TOFU дл� ключа"
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|викори�товувати вказаний типовий закритий ключ"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|шифрувати також до вказаного ідентифікатора кори�тувача"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|в�тановити замінники адре�и електронної пошти"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "�трого викори�товувати �тандарт OpenPGP"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "не вно�ити змін"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "запитувати перед перезапи�ом"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the input"
+msgstr "Параметри керуванн� захи�том"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+#, fuzzy
+#| msgid "Options controlling the diagnostic output"
+msgid "Options controlling the output"
+msgstr "Параметри керуванн� діагно�тичним виводом"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "�творити дані у форматі ASCII"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|USER-ID|зашифрувати дл� вказаного ідентифікатора"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|запи�ати дані до вказаного файла"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr ""
-"|USER-ID|викори�товувати дл� �творенн� підпи�ів або розшифруванн� вказаний "
-"ідентифікатор"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "викори�товувати канонічний тек�товий режим"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|в�тановити рівень �ти�ненн� (0 — вимкнути)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "викори�товувати канонічний тек�товий режим"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+#, fuzzy
+#| msgid "Options controlling the interactivity and enforcement"
+msgid "Options controlling key import and export"
+msgstr "Параметри керуванн� інтерактивні�тю та приму�ом"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|FILE|запи�ати дані до вказаного файла"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr ""
+"|MECHANISMS|викори�товувати вказаний механізм дл� пошуку ключів за адре�ою"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "не вно�ити змін"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "заборонити до�туп до dirmngr"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "запитувати перед перезапи�ом"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+#, fuzzy
+#| msgid "Options controlling the configuration"
+msgid "Options controlling key listings"
+msgstr "Параметри керуванн� налаштуванн�ми"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "�трого викори�товувати �тандарт OpenPGP"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "показати �пи�ок закритих ключів"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|зашифрувати дл� вказаного ідентифікатора"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr ""
+"|USER-ID|викори�товувати дл� �творенн� підпи�ів або розшифруванн� вказаний "
+"ідентифікатор"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2768,7 +2934,7 @@ msgstr ""
 "(Щоб ознайомити�� зі �пи�ком команд і параметрів, �кори�тайте�� �торінкою "
 "довідника (man))\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2789,11 +2955,11 @@ msgstr ""
 " --list-keys [назви]        показати ключі\n"
 " --fingerprint [назви]      показати відбитки\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Викори�танн�: @GPG@ [параметри] [файли] (-h — довідка)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2803,7 +2969,7 @@ msgstr ""
 "Підпи�уванн�, перевірка підпи�ів, шифруванн� або розшифруванн�\n"
 "Типова ді� залежатиме від вхідних даних\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2811,77 +2977,77 @@ msgstr ""
 "\n"
 "Підтримувані алгоритми:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "Відкритий ключ: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "Шифр: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "Хеш: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "Сти�ненн�: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "кори�туванн�: %s [параметри] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "не�умі�ні команди\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "у визначенні групи «%s» немає знаку «=»\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "УВ�Г�: визначенн� вла�ника домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "УВ�Г�: визначенн� вла�ника у файлі налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "УВ�Г�: визначенн� вла�ника додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до файла налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "УВ�Г�: визначенн� прав до�тупу до додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� вла�ника підлеглого каталогу домашнього каталогу «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2889,21 +3055,21 @@ msgstr ""
 "УВ�Г�: визначенн� вла�ника у підлеглому каталозі, визначеному файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� вла�ника підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1660
+#: g10/gpg.c:1686
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до підлеглого каталогу домашнього каталогу "
 "«%s» не є безпечним\n"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2911,469 +3077,469 @@ msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до підлеглого каталогу, визначеного файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "невідомий пункт налаштувань «%s»\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "показувати фотоідентифікатори у �пи�ках ключів"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "показувати дані щодо викори�танн� ключа у �пи�ках ключів"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "показувати адре�и правил у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "показувати в�і примітки у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "показувати �тандартні примітки IETF у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "показувати примітки кори�тувача у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показувати адре�и о�новних �ерверів ключів у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "показувати чинні�ть ідентифікаторів кори�тувачів у �пи�ках ключів"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показувати відкликані та за�тарілі ідентифікатори кори�тувачів у �пи�ках "
 "ключів"
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показувати відкликані та за�тарілі підключі у �пи�ках ключів"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "показувати назву �ховища ключів у �пи�ках ключів"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "показувати дати завершенн� �троків дії у �пи�ку підпи�ів"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "невідомі правила TOFU «%s»\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(команда «help» виводить �пи�ок можливих варіантів)\n"
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Цією командою не можна кори�тувати�� у режимі %s.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "З�УВ�ЖЕ��Я: %s не призначено дл� звичайного викори�танн�!\n"
 
-#: g10/gpg.c:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "«%s» не є коректним запи�ом завершенн� �троку дії підпи�у\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "«%s» не є коректною адре�ою електронної пошти\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "некоректний режим pinentry, «%s»\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "некоректне походженн� запиту «%s»\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "«%s» не є коректним набором �имволів\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "не вдало�� обробити адре�у �ервера ключів\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: некоректні параметри �ервера ключів\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "некоректні параметри �ервера ключів\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: некоректні параметри імпортуванн�\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "некоректні параметри імпортуванн�\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "некоректний параметр фільтруванн�: %s\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: некоректні параметри ек�портуванн�\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "некоректні параметри ек�портуванн�\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: некоректні параметри побудови �пи�ку\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "некоректні параметри побудови �пи�ку\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "показувати фотоідентифікатори під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "показувати адре�и правил під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "показувати в�і примітки під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "показувати �тандартні примітки IETF під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "показувати вказані кори�тувачем примітки під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "показувати адре�и о�новних �ерверів ключів у �пи�ках перевірки підпи�ів"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показувати чинні�ть ідентифікаторів кори�тувача під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показувати відкликані та за�тарілі ідентифікатори кори�тувачів у �пи�ках "
 "перевірки підпи�ів"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показувати лише о�новний ідентифікатор кори�тувача під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "перевірити підпи�и за допомогою даних PKA"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "підн�ти рівень довіри до підпи�ів з коректними даними PKA"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: некоректні параметри перевірки\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "некоректні параметри перевірки\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не вдало�� в�тановити шл�х дл� запу�ку у значенн� %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: некоректний �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "некоректний �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "УВ�Г�: можливе �творенн� дампу пам’�ті програми!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "УВ�Г�: %s перевизначає %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не можна викори�товувати разом з %s!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s є зайвим, �кщо викори�тано %s!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "УВ�Г�: запущено з фіктивним �и�темним ча�ом: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не буде запущено з помилками у захи�ті пам’�ті через %s\n"
 
-#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "вибраний алгоритм шифруванн� є некоректним\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "вибраний алгоритм �ти�канн� є некоректним\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "вибраний алгоритм �творенн� контрольних �ум дл� �ертифікації є некоректним\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "значенн� completes-needed має бути більшим за 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "значенн� marginals-needed має перевищувати 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "некоректне значенн� min-cert-level; має бути 1, 2 або 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "З�УВ�ЖЕ��Я: наполегливо не рекомендуємо вам кори�тувати�� про�тим режимом "
 "S2K (0)\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "некоректні типові параметри\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "некоректні о�оби�ті параметри шифруванн�\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "некоректні о�оби�ті параметри контрольної �уми\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "некоректні о�оби�ті параметри �ти�канн�\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ще не може працювати разом з %s\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм �ти�канн� «%s» не можна викори�товувати у режимі %s\n"
 
-#: g10/gpg.c:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "не вдало�� ініціалізувати базу даних надійно�ті (TrustDB): %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "УВ�Г�: отримувачів (-r) вказано без викори�танн� шифруванн� відкритим "
 "ключем\n"
 
-#: g10/gpg.c:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "помилка під ча� �проби �иметричного шифруванн� «%s»: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --encrypt у режимі --s2k-"
 "mode 0\n"
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "помилка під ча� над�иланн� даних на �ервер ключів: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "помилка під ча� �проби отриманн� даних з �ервера ключів: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "помилка під ча� �проби ек�портуванн� ключа: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "�проба ек�портуванн� ключа ssh зазнала невдачі: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "помилка пошуку на �ервері ключів: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "помилка оновленн� з �ервера ключів: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "помилка перетворенн� з формату ASCII: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "помилка перетворенн� у формат ASCII: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "некоректний алгоритм хешуванн� «%s»\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "помилка під ча� �проби обробки �пецифікації ключа «%s»: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "УВ�Г�: команд не надано. �амагаємо�� вгадати, що вам потрібно...\n"
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Почніть вводити ваше повідомленн�...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "вказана адре�а правил �ертифікації є некоректною\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "вказана адре�а правил підпи�уванн� є некоректною\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "вказана адре�а о�новного �ервера ключів є некоректною\n"
@@ -3386,7 +3552,7 @@ msgstr "|FILE|визначити ключі з файла Ñ�ховища клюÑ
 msgid "make timestamp conflicts only a warning"
 msgstr "�упроводжувати конфлікти ча�ових позначок лише попередженн�ми"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|запи�увати до де�криптора файла дані щодо �тану"
 
@@ -4099,7 +4265,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ви певні, що в�е ще бажаєте підпи�ати його? (y/N або т/�) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  �еможливо підпи�ати.\n"
 
@@ -4274,8 +4440,8 @@ msgstr "Цей ключ ретельно перевірено мною.\n"
 msgid "Really sign? (y/N) "
 msgstr "Підпи�ати? (y/N або т/�) "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "помилка під ча� �проби підпи�уванн�: %s\n"
@@ -4476,7 +4642,7 @@ msgstr ""
 "  «t» дл� надійних підпи�ів (tsign), «nr» дл� підпи�ів без відкликанн�\n"
 "  (nrsign) або будь-�ку комбінацію (ltsign, tnrsign тощо).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "Ключ відкликано."
 
@@ -4524,7 +4690,7 @@ msgstr "Вилучити цей ідентифікатор кориÑ�тувачÐ
 msgid "Really move the primary key? (y/N) "
 msgstr "Вилучити о�новний ключ? (y/N або т/�) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "Вам �лід вибрати лише один ключ.\n"
 
@@ -4601,166 +4767,166 @@ msgstr "Зберегти зміни? (y/N або т/�) "
 msgid "Quit without saving? (y/N) "
 msgstr "Вийти без збереженн�? (y/N або т/�) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не змінено, отже оновленн� непотрібне.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "помилка перевірки �пи�ку довіри: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "помилка перевірки �пи�ку довіри: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "«%s» не є відбитком\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "«%s» не є о�новним відбитком\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "�екоректний ідентифікатор кори�тувача «%s»: %s\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "�емає відповідних ідентифікаторів кори�тувачів."
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "�ічого підпи�увати.\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "�е підпи�ано вами.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "невдала �проба перевірити �творений підпи�: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "«%s» не є коректним запи�ом завершенн� �троку дії\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "«%s» не є належним відбитком\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "не знайдено підключ «%s»\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "Контрольна �ума: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "Можливо�ті: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "Сервер ключів без можливо�ті зміни"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "О�новний �ервер ключів: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "Примітки: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Переваг дл� ідентифікаторів кори�тувачів у форматі PGP 2.x не передбачено.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Вказаний нижче ключ було відкликано %s %s ключем %s\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Цей ключ може бути відкликано %s ключем %s"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(важливий)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "�творено: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "відкликано: %s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "не діє з: %s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "діє до: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "викори�танн�: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "номер картки: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "надійні�ть: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "чинні�ть: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "Цей ключ було вимкнено"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4768,17 +4934,17 @@ msgstr ""
 "Зауважте, що показані дані щодо чинно�ті ключів не обов’�зково є коректними\n"
 "до перезапу�ку програми.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "відкликано"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "збіг �трок дії"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4789,17 +4955,17 @@ msgstr ""
 "              цієї команди можна зробити о�новним інший ідентифікатор "
 "кори�тувача.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "УВ�Г�: �трок дії вашого підключа імпортуванн� невдовзі завершить��.\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Ймовірно, вам варто змінити також і його �трок дії.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4809,35 +4975,35 @@ msgstr ""
 "до відмови\n"
 "         у викори�танні цього ключа де�кими вер�і�ми PGP.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ви �правді бажаєте додати його? (y/N або т/�) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "�е можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
 
-#: g10/keyedit.c:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "У цьому ключі вже і�нує такий ідентифікатор кори�тувача!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Вилучити цей дій�ний підпи�? (y/N/q або т/�/в)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Вилучити цей некоректний підпи�? (y/N/q або т/�/в)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Вилучити цей невідомий підпи�? (y/N/q або т/�/в)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Вилучити цей �амопідпи�? (y/N або т/�)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4845,20 +5011,20 @@ msgstr[0] "Вилучено %d підпи�.\n"
 msgstr[1] "Вилучено %d підпи�и.\n"
 msgstr[2] "Вилучено %d підпи�ів.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "�ічого не вилучено.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "некоректний"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Ідентифікатор кори�тувача «%s» ущільнено: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4866,17 +5032,17 @@ msgstr[0] "Ідентифікатор кориÑ�тувача «%s»: вилучÐ
 msgstr[1] "Ідентифікатор кори�тувача «%s»: вилучено %d підпи�ів\n"
 msgstr[2] "Ідентифікатор кори�тувача «%s»: вилучено %d підпи�ів\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Ідентифікатор кори�тувача «%s»: вже мінімізовано\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Ідентифікатор кори�тувача «%s»: вже очищено\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4886,42 +5052,42 @@ msgstr ""
 "призве�ти до відмови\n"
 "         у викори�танні цього ключа де�кими вер�і�ми PGP.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "�е можна додавати підпи�ане відкликанн� до ключа у форматі PGP 2.x.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Вкажіть ідентифікатор кори�тувача підпи�аного відкликанн�: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "не можна призначати ключ у форматі PGP 2.x підпи�аним відкликанн�м\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "не можна призначати ключ вла�ним підпи�аним відкликанн�м\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "цей ключ вже було позначено �к призначений дл� відкликанн�\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "УВ�Г�: призначенн� ключа �к підпи�аного відкликанн� не можна �ка�овувати!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Ви �правді бажаєте призначити цей ключ �к підпи�ане відкликанн�? (y/N або т/"
 "�) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4929,176 +5095,176 @@ msgstr ""
 "Ви �правді хочете змінити ча� вичерпанн� �троку дії дл� декількох підключів? "
 "(y/N або т/�) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Зміна ча�у завершенн� �троку дії дл� підключа.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Зміна ча�у завершенн� �троку дії дл� о�новного ключа.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "�е можна змінювати дату завершенн� �троку дії ключа v3\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 msgid "Changing usage of a subkey.\n"
 msgstr "Змінюємо викори�танн� підключа.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 msgid "Changing usage of the primary key.\n"
 msgstr "Змінюємо викори�танн� о�новного підключа.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "підпи�уванн� підключа %s вже перехре�но �ертифіковано\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "підключ %s не призначено дл� підпи�уванн�, отже його не потрібно перехре�но "
 "�ертифікувати\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "Будь ла�ка, виберіть лише один ідентифікатор кори�тувача.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропу�каємо �амопідпи� v3 дл� ідентифікатора кори�тувача «%s»\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "Вкажіть адре�у вашого о�новного �ервера ключів: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ви �правді бажаєте замінити його? (y/N або т/�) "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ви �правді бажаєте вилучити його? (y/N або т/�) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "Вкажіть примітку: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "Продовжувати? (y/N або т/�) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ідентифікатора кори�тувача з індек�ом %d не і�нує\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ідентифікатора кори�тувача з хешем %s не і�нує\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Піключа із ідентифікатором ключа «%s» не і�нує.\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Підключа з індек�ом %d не і�нує\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Ідентифікатор кори�тувача: «%s»\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "підпи�ано вашим ключем %s %s%s%s\n"
 
-#: g10/keyedit.c:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (неек�портовний)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Строк дії цього підпи�у завершуєть�� %s.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ви �правді бажаєте відкликати його? (y/N або т/�) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Створити �ертифікат відкликанн� дл� цього підпи�у? (y/N або т/�) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вами підпи�ано ці ідентифікатори кори�тувачів у ключі %s:\n"
 
-#: g10/keyedit.c:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (невідкликуваний)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "відкликано вашим ключем %s у %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "Ви маєте намір відкликати ці підпи�и:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Справді �творити �ертифікати відкликанн�? (y/N або т/�) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "немає закритого ключа\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "�проба відкликати ідентифікатор, �кий не належить кори�тувачеві: %s\n"
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ідентифікатор кори�тувача «%s» вже відкликано\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "УВ�Г�: підпи� ідентифікатора кори�тувача позначено датою на %d �екунд у "
 "майбутньому\n"
 
-#: g10/keyedit.c:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s вже відкликано.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Підключ %s вже відкликано.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ фотоідентифікатора %s розміру %ld дл� ключа %s (uid %d)\n"
@@ -5564,7 +5730,7 @@ msgstr ""
 "п�евдовипадкових чи�ел �творити краще випадкове чи�ло.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Помилка під ча� �проби �творенн� ключа: %s\n"
@@ -5635,11 +5801,11 @@ msgstr "не знайдено придатного до запиÑ�у Ñ�ховиÑ
 msgid "error writing public keyring '%s': %s\n"
 msgstr "помилка під ча� �проби запи�у до �ховища відкритих ключів «%s»: %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "відкритий і закритий ключі �творено і підпи�ано.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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"
@@ -5647,7 +5813,7 @@ msgstr ""
 "Зауважте, що цей ключ не може бути викори�тано дл� шифруванн�. Ви можете\n"
 "�кори�тати�� командою «--edit-key» дл� �творенн� підключа з цією метою.\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5655,7 +5821,7 @@ msgstr ""
 "ключ було �творено з позначкою на %lu �екунд у майбутньому (ча�ова петл� або "
 "проблема з годинником)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5663,22 +5829,22 @@ msgstr ""
 "ключ було �творено з позначкою на %lu �екунду у майбутньому (ча�ова петл� "
 "або проблема з годинником)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "З�УВ�ЖЕ��Я: �творенн� підключів дл� ключів v3 не�умі�не з OpenPGP\n"
 
-#: g10/keygen.c:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Закриті ча�тини о�новного ключа недо�тупні.\n"
 
-#: g10/keygen.c:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Закриті ча�тини о�новного ключа зберігають�� на картці.\n"
 
-#: g10/keygen.c:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "Створити? (y/N або т/�) "
 
@@ -5896,267 +6062,267 @@ msgstr "над�илаємо запит щодо ключа з «%s»\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "УВ�Г�: не вдало�� отримати адре�у %s: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "дивний розмір дл� зашифрованого ключа �еан�у (%d)\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "зашифрований %s ключ �еан�у\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr ""
 "пароль �творено за допомогою невідомого алгоритму �творенн� контрольних �ум "
 "%d\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "відкритий ключ — %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "зашифровані відкритим ключем дані: належний DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "зашифровано за допомогою %u-бітового %s ключа, ідентифікатор %s, �творено "
 "%s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      «%s»\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключем %s, ідентифікатор %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "невдала �проба розшифровуванн� відкритим ключем: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "УВ�Г�: ви�влено декілька фрагментів нешифрованого тек�ту\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано за допомогою %lu паролів\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано за допомогою 1 парол�\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "припу�каємо, що дані зашифровано %s\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Шифр IDEA недо�тупний, �пробуємо �кори�тати�� замі�ть нього %s\n"
 
-#: g10/mainproc.c:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "УВ�Г�: цілі�ні�ть повідомленн� не захищено\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "невдала �проба розшифруванн�: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "розшифровано\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "УВ�Г�: зашифроване повідомленн� було змінено!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "невдала �проба розшифруванн�: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "З�УВ�ЖЕ��Я: вимога відправника: «лише дл� Ва�»\n"
 
-#: g10/mainproc.c:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "початкова назва файла=«%.*s»\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "окреме відкликанн� — �кори�тайте�� командою «gpg --import» дл� за�то�уванн�\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "підпи�у не знайдено\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПОМИЛКОВИЙ підпи� від «%s»"
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Про�трочений підпи� від «%s»"
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "�алежний підпи� від «%s»"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "перевірку підпи�ів придушено\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не вдало�� обробити ці дані з неоднозначним підпи�ом\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Підпи� �творено %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               за допомогою %s ключа %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Підпи� �творено %s ключем %s з ідентифікатором %s\n"
 
-#: g10/mainproc.c:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               видавець «%s»\n"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "Ключ до�тупний на: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[непевний]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                або «%s»"
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "УВ�Г�: цей ключ не можна викори�товувати дл� підпи�уванн� у режимі %s\n"
 
-#: g10/mainproc.c:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Строк дії підпи�у вичерпано %s\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Підпи� діє до %s\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s підпи�, алгоритм контрольної �уми %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "двійковий"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "тек�товий"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "невідомо"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ", алгоритм ключа "
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "УВ�Г�: не відє’днаний підпи�; файл «%s» не було перевірено!\n"
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�е вдало�� перевірити підпи�: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "не є від’єднаним підпи�ом\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "УВ�Г�: ви�влено кратні підпи�и. Буде перевірено лише перший.\n"
 
-#: g10/mainproc.c:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "окремий підпи� кла�у 0x%02x\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "підпи� у за�тарілому форматі (PGP 2.x)\n"
@@ -6227,69 +6393,69 @@ msgstr "(повідомлена помилка: %s <%s>)\n"
 msgid "(further info: "
 msgstr "(подальша інформаці�: "
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: за�тарілий параметр «%s»\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "УВ�Г�: «%s» вважаєть�� за�тарілим параметром\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "будь ла�ка, �кори�тайте�� «%s%s»\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "УВ�Г�: «%s» вважаєть�� за�тарілою командою — не кори�туйте�� нею\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: «%s» є за�тарілим у цьому файлі — він працює лише у %s\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr ""
 "УВ�Г�: «%s%s» є за�тарілим параметром — він не працюватиме, окрім �к на %s\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "�е�ти�нений"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "uncompressed|немає"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "викори�танн� цього повідомленн� щодо %s може бути неможливим\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "неоднозначний параметр «%s»\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "невідомий параметр «%s»\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "Відкритий ключ ECDSA має зберігати�� у кодуванні SEC кратному 8-бітовому\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "невідома �лабка контрольна �ума «%s»\n"
@@ -6322,25 +6488,25 @@ msgstr "запи�уємо до stdout\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "припу�каємо підпи�ані дані у «%s»\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "робота з алгоритмом �творенн� відкритого ключа %d неможлива\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "УВ�Г�: потенційно небезпечний зашифрований �иметричним алгоритмом ключ "
 "�еан�у\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "Критична примітка підпи�у: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "підпакет типу %d мі�тить критичний набір бітів\n"
@@ -6756,12 +6922,12 @@ msgstr "невідомий типовий отримувач «%s»\n"
 msgid "no valid addressees\n"
 msgstr "немає коректних адре�\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Зауваженн�: у ключі %s не передбачено можливо�ті %s\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Зауваженн�: у ключі %s не передбачено переваг дл� %s\n"
@@ -7214,7 +7380,7 @@ msgstr ""
 "це ключ Elgamal �творений за допомогою PGP, цей ключ недо�татньо безпечний "
 "дл� підпи�уванн�!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "запи� щодо довіри %lu, тип %d: помилка запи�уванн�: %s\n"
@@ -7259,7 +7425,7 @@ msgstr "не вдало�� знайти запи� довіри у «%s»: %s\n
 msgid "read error in '%s': %s\n"
 msgstr "помилка читанн� у «%s»: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: помилка �инхронізації: %s\n"
@@ -7811,95 +7977,95 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "«%s» не є коректним довгим ідентифікатором ключа\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "ключ %s: прийн�то �к надійний ключ\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "ключ %s зу�трічаєть�� у trustdb декілька разів\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "ключ %s: немає відкритого ключа дл� надійного ключа — пропущено\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "ключ %s позначено �к ключ з необмеженою довірою\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "запи� довіри %lu, тип запиту %d: помилка читанн�: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "запи� довіри %lu не належить до вказаного типу %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "Ви можете �пробувати повторно �творити trustdb за допомогою команд:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr ""
 "Якщо результат буде незадовільним, будь ла�ка, зверніть�� до підручника\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "викори�танн� невідомої моделі довіри (%d) неможливе — припу�каємо модель "
 "довіри %s\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "викори�товуємо модель довіри %s\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "потреби у перевірці trustdb немає\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "на�тупну перевірку trustdb призначено на %s\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "потреби у перевірці trustdb на о�нові моделі довіри «%s» немає\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "потреби у оновленні trustdb на о�нові моделі довіри «%s» немає\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "відкритий ключ %s не знайдено: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "будь ла�ка, �кори�тайте�� параметром --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "перевірка trustdb\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -7907,7 +8073,7 @@ msgstr[0] "оброблено %d ключ"
 msgstr[1] "оброблено %d ключі"
 msgstr[2] "оброблено %d ключів"
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -7915,17 +8081,17 @@ msgstr[0] " (очищено %d значенн� чинно�ті)\n"
 msgstr[1] " (очищено %d значенн� чинно�ті)\n"
 msgstr[2] " (очищено %d значень чинно�ті)\n"
 
-#: g10/trustdb.c:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "не знайдено ключів з необмеженою довірою\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "не знайдено відкритий ключ ключа з необмеженою довірою %s\n"
 
-#: g10/trustdb.c:2209
+#: g10/trustdb.c:2252
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7933,28 +8099,28 @@ msgstr ""
 "глибина: %d  чинні�ть: %3d  підпи�ано: %3d  надійні�ть: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2290
+#: g10/trustdb.c:2333
 #, 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 "безмежна"
 
@@ -7966,39 +8132,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 "[безмежна]"
 
@@ -8046,19 +8212,19 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Будь ла�ка, вкажіть пінкод дл� ключа, призначеного дл� �творенн� �кі�них "
@@ -8066,17 +8232,17 @@ 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Вкажіть адміні�тративний пінкод"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|P|Будь ла�ка, вкажіть код розблокуванн� пінкоду (PUK) дл� �тандартних "
 "ключів."
 
-#: scd/app-p15.c:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Вкажіть пінкод дл� �тандартних ключів."
 
@@ -8153,7 +8319,7 @@ msgstr "не вдало�� зберегти відбиток: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "не вдало�� зберегти дату �творенн�: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "помилка отриманн� �тану CHV з картки\n"
@@ -8218,7 +8384,7 @@ msgstr "Пінкод длÑ� CHV%d занадто короткий; мінімаÐ
 msgid "verify CHV%d failed: %s\n"
 msgstr "помилка перевірки CHV%d: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "картку заблоковано!\n"
@@ -8368,13 +8534,13 @@ msgstr "карткою не підтримуєть�� алгоритм конт
 msgid "signatures created so far: %lu\n"
 msgstr "вже �творено підпи�ів: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "перевірку адміні�тративного пінкоду заборонено цією командою\n"
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "не вдало�� отримати до�туп до %s — некоректна картка OpenPGP?\n"
@@ -8390,55 +8556,55 @@ msgstr "||Вкажіть ваш пінкод за допомогою клавіÐ
 msgid "|N|Initial New PIN"
 msgstr "|N|Початковий новий пінкод"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "запу�тити у режимі декількох �ерверів (о�новному режимі)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|в�тановити вказаний рівень діагно�тики"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|запи�увати журнал до файла"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|з’єднати�� зі зчитувачем на вказаному порту"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|викори�товувати вказаний драйвер ct-API"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|викори�товувати вказаний драйвер PC/SC"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "не викори�товувати вбудованого драйвера CCID"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|від’єднати безді�льну вказану кількі�ть �екунд картку"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "не викори�товувати додаткову клавіатуру зчитувача"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "заборонити викори�танн� команд з адміні�труванн� картки"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "викори�товувати змінну довжину вхідних даних дл� зчитувача"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "заборонити викори�танн� команд з адміні�труванн� картки"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Викори�танн�: @SCDAEMON@ [параметри] (-h — довідка)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8446,23 +8612,29 @@ msgstr ""
 "Синтак�и�: scdaemon [параметри] [команди [аргументи]]\n"
 "Фонова �лужба карток пам’�ті дл� @GNUPG@\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "будь ла�ка, �кори�тайте�� параметром «--daemon» дл� запу�ку програми у "
 "фоновому режимі\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "запущено запу�к обробки дл� де�криптора %d\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "роботу обробника дл� де�криптора %d перервано\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "помилка під ча� �проби отриманн� даних щодо викори�танн� ключа: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8520,7 +8692,7 @@ msgstr "пошук видавц� за зовнішньою адре�ою\n"
 msgid "number of issuers matching: %d\n"
 msgstr "кількі�ть відповідних видавців: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "не вдало�� отримати authorityInfoAccess: %s\n"
@@ -8679,7 +8851,7 @@ msgstr "кореневий Ñ�ертифікат не позначено Ñ�к нÐ
 msgid "checking the trust list failed: %s\n"
 msgstr "помилка перевірки �пи�ку довіри: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "занадто довгий ланцюжок �ертифікації\n"
@@ -8735,7 +8907,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u-бітовий хеш не є коректним дл� %u-бітового ключа %s\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8746,7 +8918,7 @@ msgstr "вихід за межі обла�ті пам’�ті\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(це алгоритм MD2)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "немає"
 
@@ -8781,42 +8953,37 @@ msgstr ""
 "С/� %s, ідентифікатор 0x%08lX,\n"
 "�творено %s, за�таріває %s.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "не вказано викори�танн� ключа — припу�каємо в�і можливі викори�танн�\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "помилка під ча� �проби отриманн� даних щодо викори�танн� ключа: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� �ертифікації\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� підпи�уванн� відповідей OCSP\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� шифруванн�\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� підпи�уванн�\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "�ертифікат непридатний дл� шифруванн�\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "�ертифікат непридатний дл� підпи�уванн�\n"
@@ -9008,6 +9175,11 @@ msgstr "Створити �амопідпи�аний �ертифікат? (y/N
 msgid "These parameters are used:\n"
 msgstr "Викори�тано ці параметри:\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "помилка �творенн� тимча�ового файла: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "Створюємо �амопідпи�аний �ертифікат.  "
@@ -9087,126 +9259,126 @@ msgstr "помилка під чаÑ� Ñ�проби вилученнÑ� Ñ�ертиÑ
 msgid "no valid recipients given\n"
 msgstr "не вказано коректних отримувачів\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "показати ключ зовнішніх ключів"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "показати ланцюжок �ертифікації"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "імпортувати �ертифікати"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "ек�портувати �ертифікати"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "зареє�трувати картку пам’�ті"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "передати команду dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "виклик gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "�творити дані, закодовані у BASE64"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "взагалі не викори�товувати термінал"
+
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "кількі�ть �ертифікатів, �кі �лід включити"
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|вз�ти дані щодо правил з вказаного файла"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "вважати вхідні дані даними у форматі PEM"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "вважати вхідні дані даними у форматі BASE64"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "вважати вхідні дані даними у двійковому форматі"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "�творити дані, закодовані у BASE64"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr ""
+"|USER-ID|викори�товувати ідентифікатор кори�тувача �к типовий закритий ключ"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|додати �ховище ключів до �пи�ку �ховищ ключів"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "�аді�лати запит щодо незнайдених �ертифікатів видавц�"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "викори�товувати вказане кодуванн� дл� паролів PKCS#12"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "не викори�товувати С�С"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "не шукати у �пи�ках відкликаних �ертифікатів кореневі �ертифікати"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "перевір�ти чинні�ть за допомогою OCSP"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "кількі�ть �ертифікатів, �кі �лід включити"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|FILE|вз�ти дані щодо правил з вказаного файла"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "не перевір�ти правила �ертифікатів"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "�аді�лати запит щодо незнайдених �ертифікатів видавц�"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "взагалі не викори�товувати термінал"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|FILE|запи�увати журнал режиму �ервера до файла"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|викори�товувати вказаний алгоритм шифруванн�"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FILE|запи�увати журнал перевірки до файла"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr ""
+"|NAME|викори�товувати вказаний алгоритм обчи�ленн� контрольної �уми "
+"повідомленн�"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "пакетний режим: нічого не запитувати"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "вважати відповіддю на більші�ть питань «так»"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "вважати відповіддю на більші�ть питань «ні»"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FILE|додати �ховище ключів до �пи�ку �ховищ ключів"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr ""
-"|USER-ID|викори�товувати ідентифікатор кори�тувача �к типовий закритий ключ"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "викори�товувати цей �ервер ключів дл� пошуку"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|викори�товувати вказаний алгоритм шифруванн�"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr ""
-"|NAME|викори�товувати вказаний алгоритм обчи�ленн� контрольної �уми "
-"повідомленн�"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|запи�увати журнал перевірки до файла"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Викори�танн�: @GPGSM@ [параметри] [файли] (-h — довідка)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9217,27 +9389,27 @@ msgstr ""
 "протоколу S/MIME\n"
 "Типова ді� залежатиме від вхідних даних\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "З�УВ�ЖЕ��Я: не вда�ть�� зашифрувати до «%s»: %s\n"
 
-#: sm/gpgsm.c:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "невідома модель перевірки «%s»\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "імпортуємо загальні �ертифікати «%s»\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "підпи�уванн� за допомогою «%s» неможливе: %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "некоректна команда (немає не�вної команди)\n"
@@ -9297,7 +9469,7 @@ msgstr "проблема з повторним пошуком �ертифіка
 msgid "error storing flags: %s\n"
 msgstr "помилка під ча� �проби збереженн� позначок: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "Помилка - "
 
@@ -9333,7 +9505,7 @@ msgstr ""
 "\n"
 "%s%sВи �правді хочете це зробити?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9386,7 +9558,7 @@ msgstr "[дату не вказано]"
 msgid "algorithm:"
 msgstr "алгоритм: %s"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
@@ -9394,17 +9566,17 @@ msgstr ""
 "некоректний підпи�: атрибут контрольної �уми повідомленн� не збігаєть�� з "
 "обчи�леною �умою\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "Правильний підпи� від"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "                або"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "Це �кі�ний підпи�\n"
@@ -10194,112 +10366,135 @@ msgstr "мало бути вказано аб�олютний шл�х до фа
 msgid "looking up '%s'\n"
 msgstr "пошук «%s»\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "показати вмі�т кешу CRL"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|завантажити CRL з вказаного файла до кешу"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|отримати CRL з вказаної адре�и"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "завершити роботу dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "�порожнити кеш"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|FILE|запи�увати журнал режиму �ервера до файла"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr "дозволити інтерактивну перевірку вер�ії програмного забезпеченн�"
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "запу�тити без запиту до кори�тувача"
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr "|N|повертати не більше за вказану кількі�ть запи�ів на запит"
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
-msgstr "приму�ове завантаженн� за�тарілих С�С"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr ""
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "дозволити над�иланн� запитів OCSP"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
+msgstr "маршрутизувати уве�ь обмін даними з мережею через Tor"
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
-msgstr "дозволити інтерактивну перевірку вер�ії програмного забезпеченн�"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "�алаштуванн� дл� �ерверів ключів"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|викори�товувати �ервер ключів за адре�ою"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+msgstr "|FILE|викори�товувати �ертифікати CA з файла дл� HKP крізь TLS"
+
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr "�алаштуванн� дл� �ерверів HTTP"
+
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "заборонити викори�танн� HTTP"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "заборонити викори�танн� LDAP"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr "ігнорувати точки поширенн� С�С протоколу HTTP"
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
-msgstr "ігнорувати точки поширенн� С�С протоколу LDAP"
-
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "ігнорувати адре�и �лужб OCSP з �ертифікатами"
-
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|пере�пр�мувати в�і запити HTTP на вказану адре�у"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "викори�товувати загально�и�темний прок�і-�ервер HTTP"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "�алаштуванн� викори�танн� �ерверів LDAP"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "заборонити викори�танн� LDAP"
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr "ігнорувати точки поширенн� С�С протоколу LDAP"
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|викори�товувати вказаний вузол дл� запитів LDAP"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "не викори�товувати резервні вузли з --ldap-proxy"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "викори�товувати цей �ервер ключів дл� пошуку"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|прочитати �пи�ок �ерверів LDAP з вказаного файла"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "додати ви�влені у точках поширенн� CRL нові �ервери до �пи�ку �ерверів"
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|в�тановити вказаний ча� очікуванн� даних від LDAP"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "�алаштуванн� OCSP"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "дозволити над�иланн� запитів OCSP"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "ігнорувати адре�и �лужб OCSP з �ертифікатами"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|викори�товувати відповідач OCSP за вказаною адре�ою"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|відповідь OCSP підпи�ано FPR"
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
-msgstr "|N|повертати не більше за вказану кількі�ть запи�ів на запит"
-
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr "|FILE|викори�товувати �ертифікати CA з файла дл� HKP крізь TLS"
-
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
-msgstr "маршрутизувати уве�ь обмін даними з мережею через Tor"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "приму�ове завантаженн� за�тарілих С�С"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10309,11 +10504,11 @@ msgstr ""
 "(Щоб ознайомити�� зі �пи�ком команд і параметрів, �кори�тайте�� �торінкою "
 "довідника (man) «info»)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Викори�танн�: @DIRMNGR@ [параметри] (-h — довідка)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10321,84 +10516,84 @@ msgstr ""
 "Синтак�и�: @DIRMNGR@ [параметри] [команда [аргументи]]\n"
 "До�туп до �ервера ключів, CRL та OCSP дл� @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "коректними рівн�ми зневаджуванн� є: %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "викори�танн�: %s [параметри]"
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "не можна викори�товувати двокрапки у назві �окета\n"
 
-#: dirmngr/dirmngr.c:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "помилка під ча� �проби отриманн� CRL з «%s»: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "помилка під ча� обробки CRL з «%s»: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: занадто довгий р�док — пропущено\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: ви�влено некоректний відбиток\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: помилка під ча� читанн�: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: беззмі�товні дані наприкінці р�дка проігноровано\n"
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 "отримано �игнал SIGHUP — повторне читанн� налаштувань та �порожненн� кешу\n"
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "отримано �игнал SIGUSR2 — дій не визначено\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "отримано �игнал SIGTERM — завершуємо роботу…\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "отримано �игнал SIGTERM — підтримуєть�� %d активних з’єднань\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "приму�ове завершенн� роботи\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "отримано �игнал SIGINT — негайне завершенн� роботи\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "отримано �игнал %d — дій не визначено\n"
@@ -10589,91 +10784,91 @@ msgstr "�проба хешуванн� відповіді OCSP дл� «%s» з
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "не підпи�ано типовим �ертифікатом підпи�увальника OCSP"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "�проба розміщенн� пункту �пи�ку у пам’�ті зазнала невдачі: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "помилка під ча� �проби отриманн� ідентифікатора відповідача: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "не ви�влено �ертифіката видавц�: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "викликаною підпрограмою не повернуто �ертифіката призначенн�\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "викликаною підпрограмою не повернуто �ертифіката видавц�\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "не вдало�� розмі�тити контек�т OCSP: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "не визначено типового відповідача за OCSP\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "не визначено типового підпи�увача за OCSP\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "викори�товуємо типовий відповідач за OCSP «%s»\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "викори�товуємо відповідач за OCSP «%s»\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "помилка під ча� отриманн� �тану OCSP дл� �ертифіката призначенн�: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "�тан �ертифіката: %s  (цей=%s  на�тупний=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr "придатний"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "�ертифікат було відкликано: %s причина: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "Відповідачем OCSP повернуто �тан у майбутньому\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "Відповідачем OCSP повернуто не поточний �тан\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "Відповідачем OCSP повернуто занадто за�тарілі дані щодо �тану\n"
@@ -10683,67 +10878,67 @@ msgstr "Відповідачем OCSP повернуто занадто за�т
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "помилка assuan_inquire(%s): %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "у ідентифікаторі �ертифіката немає �ерійного номера"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "помилка assuan_inquire: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "помилка fetch_cert_by_url: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "помилка під ча� �проби над�иланн� даних: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "помилка start_cert_fetch: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "помилка fetch_next_cert: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "перевищено max_replies у %d\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "не вдало�� розмі�тити �труктуру керуванн�: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "не вдало�� розмі�тити контек�т assuan: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "не вдало�� ініціалізувати �ервер: %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "не вдало�� зареє�трувати команди за допомогою Assuan: %s\n"
 
-#: dirmngr/server.c:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "проблема з прийн�тт�м Assuan: %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "помилка обробки за допомогою Assuan: %s\n"
@@ -10787,7 +10982,7 @@ msgstr "коректний ланцюжок �ертифікації\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� підпи�уванн� CRL\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "без повідомлень"
 
@@ -10882,282 +11077,134 @@ msgstr "помилка над�иланн� р�дка: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "помилка під ча� �проби над�иланн� �тандартних параметрів: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "Параметри керуванн� діагно�тичним виводом"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "Параметри керуванн� налаштуванн�ми"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "Параметри діагно�тики"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "Параметри керуванн� захи�том"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|завершувати �трок дії ключів SSH за N �екунд"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|в�тановити мак�имальний �трок дії кешу пінкодів у �екундах"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|в�тановити мак�имальний �трок дії ключа SSH у �екундах"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "Параметри приму�ового викори�танн� правил паролів"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "не дозвол�ти обхід правил паролів"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|в�тановити вказану мінімальну довжину нових паролів"
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr "|N|вимагати у нових парол�х не менше вказаної кілько�ті нелітер"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|FILE|перевір�ти нові паролі за зразком з вказаного файла"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|завершувати �трок дії паролів за вказану кількі�ть днів"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "не дозвол�ти повторне викори�танн� �тарих паролів"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|в�тановити вказаний ча� очікуванн� Pinentry у �екундах"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|викори�товувати вказаний типовий закритий ключ"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAME|шифрувати також до вказаного ідентифікатора кори�тувача"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|в�тановити замінники адре�и електронної пошти"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "�алаштуванн� дл� �ерверів ключів"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL|викори�товувати �ервер ключів за адре�ою"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "дозволити пошук PKA (запити до DNS)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr ""
-"|MECHANISMS|викори�товувати вказаний механізм дл� пошуку ключів за адре�ою"
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "імпортувати ключі з �ервера ключів"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-#| msgid "list and check key signatures"
-msgid "include the public key in signatures"
-msgstr "показати �пи�ок і перевірити підпи�и ключів"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "заборонити до�туп до dirmngr"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "викори�товувати вказане кодуванн� дл� паролів PKCS#12"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "не шукати у �пи�ках відкликаних �ертифікатів кореневі �ертифікати"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "Параметри керуванн� форматом виведенн�"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "Параметри керуванн� інтерактивні�тю та приму�ом"
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr "Параметри керуванн� викори�танн�м Tor"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "�алаштуванн� дл� �ерверів HTTP"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "викори�товувати загально�и�темний прок�і-�ервер HTTP"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "�алаштуванн� викори�танн� �ерверів LDAP"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "�пи�ок �ерверів LDAP"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "�алаштуванн� OCSP"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr "Закриті ключі"
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr "Картки пам’�ті"
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr "Мережа"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr "Введенн� парол�"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "Компонент не є придатним до запу�ку"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, 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:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Помилка зовнішньої перевірки компонента %s"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "Зауважте, що �пецифікації груп буде проігноровано\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "помилка під ча� �проби закрити «%s»\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "помилка під ча� �проби обробити «%s»'\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "показати �пи�ок в�іх компонентів"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "перевірити в�і програми"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|показати �пи�ок параметрів"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|змінити параметри"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|перевірити параметри"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "за�то�увати загальні типові значенн�"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|оновити файли налаштувань на о�нові файла Ф�ЙЛ"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "отримати назви каталогів налаштувань дл� @GPGCONF@"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "показати загальний файл налаштувань"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "перевірити загальний файл налаштувань"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr "наді�лати запит до бази даних вер�ій програмного забезпеченн�"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "перезавантажити в�і або вказаний компонент"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "запу�тити вказаний компонент"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "завершити роботу вказаного компонента"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "викори�тати файл дл� виведенн� даних"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "�кщо можна, заді�ти зміни у динамічному режимі"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "Викори�танн�: @GPGCONF@ [параметри] (-h — довідка)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -11165,15 +11212,15 @@ msgstr ""
 "Синтак�и�: @GPGCONF@ [параметри]\n"
 "Керуванн� параметрами налаштуванн� ін�трументів �и�теми @GNUPG@\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "Слід вказати один аргумент компонента"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "Компонент не знайдено"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "�е можна вказувати аргументів"
 
@@ -11190,6 +11237,40 @@ msgstr ""
 "Синтак�и�: gpg-check-pattern [параметри] файл_шаблонів\n"
 "Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "помилка під ча� �проби запи�у до тимча�ового файла: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "викори�товувати файл журналу дл� �ервера"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|FILE|запи�увати журнал режиму �ервера до файла"
+
+#~ msgid "run without asking a user"
+#~ msgstr "запу�тити без запиту до кори�тувача"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "дозволити пошук PKA (запити до DNS)"
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "імпортувати ключі з �ервера ключів"
+
+#, fuzzy
+#~| msgid "list and check key signatures"
+#~ msgid "include the public key in signatures"
+#~ msgstr "показати �пи�ок і перевірити підпи�и ключів"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "Параметри керуванн� форматом виведенн�"
+
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Параметри керуванн� викори�танн�м Tor"
+
+#~ msgid "LDAP server list"
+#~ msgstr "�пи�ок �ерверів LDAP"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "над�илаємо запит щодо ключа %s до %s �ервера %s\n"
 
@@ -11362,9 +11443,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "не вдало�� відкрити %s дл� запи�у: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "помилка під ча� запи�у до %s: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "помилка читанн� з %s: %s\n"
 
@@ -11532,9 +11610,6 @@ msgstr ""
 #~ msgid "listen() failed: %s\n"
 #~ msgstr "помилка listen(): %s\n"
 
-#~ msgid "do not grab keyboard and mouse"
-#~ msgstr "не захоплювати керуванн� клавіатурою і мишею"
-
 #~ msgid "Error: URL too long (limit is %d characters).\n"
 #~ msgstr "Помилка: адре�а є занадто довгою (мак�имум — %d �имволів).\n"
 
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index ddb4411..06047f7 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a5922c2..a5b9da0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the GnuPG package.
 # Meng Jie <zuxyhere@eastday.com>, 2004.
 # Chuhao Li <lchopn@gmail.com>, 2018.
-# bobwxc <bobwxc@yeah.net>, 2021.
+# bobwxc <bobwxc@yeah.net>, 2021, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.2.28\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-11-23 10:54+0100\n"
-"PO-Revision-Date: 2021-06-17 11:52+0900\n"
+"POT-Creation-Date: 2022-08-24 15:33+0200\n"
+"PO-Revision-Date: 2022-04-26 13:27+0800\n"
 "Last-Translator: bobwxc <bobwxc@yeah.net>\n"
 "Language-Team: None\n"
 "Language: zh_CN\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.4.2\n"
 
 #: agent/call-pinentry.c:338
 #, c-format
@@ -73,7 +73,7 @@ msgstr "|pinentry-tt|��密�"
 #. for generating a passphrase.
 #: agent/call-pinentry.c:1007
 msgid "Suggest"
-msgstr ""
+msgstr "建议"
 
 #. TRANSLATORS: This string is a tooltip, shown by pinentry when
 #. hovering over the generate button.  Please use an appropriate
@@ -83,23 +83,19 @@ msgstr ""
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
 #: agent/call-pinentry.c:1029
-#, fuzzy
-#| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
-msgstr "pinentry.qualitybar.tooltip"
+msgstr "使用�机生�的密�"
 
 #: agent/call-pinentry.c:1057
 msgid "Note: The blanks are not part of the passphrase."
-msgstr ""
+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:1116
-#, fuzzy
-#| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
-msgstr "密�太长"
+msgstr "��许的密�"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
@@ -115,7 +111,9 @@ msgstr "强度："
 #. will be used.
 #: agent/call-pinentry.c:1204
 msgid "pinentry.qualitybar.tooltip"
-msgstr "pinentry.qualitybar.tooltip"
+msgstr ""
+"上方输入的文本的质�。\n"
+"请�管�员咨询详细相关准则。"
 
 #: agent/call-pinentry.c:1367
 msgid ""
@@ -138,8 +136,8 @@ msgstr "PIN："
 msgid "Passphrase:"
 msgstr "密�："
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "�匹� - 请�试"
 
@@ -184,86 +182,108 @@ msgstr "错误的 PIN"
 msgid "Bad Passphrase"
 msgstr "错误的密�"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr "注�：�自网络�览器的请求。"
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr "注�：�自远程站点的请求。"
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "获��的�列�时出现错误： %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "请�新输入此密�"
+
+#: agent/command.c:2423
+#, c-format
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr "请输入密�以在 %s 系统内部�护已导入的对象。"
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr "此密钥（或�密钥）未�密��护。请输入新的密�以将其导出。"
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "长度超过 %d �的 ssh 密钥�被支�\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "无法创建 ‘%s’： %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "无法打开 ‘%s’： %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "获��的�列�时出现错误： %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "检测到的� S/N �为: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "�片上没有 ssh 身份验�用的密钥：%s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "没有找到�适的�片密钥：%s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "获��片列表时出现错误：%s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr "一个 ssh 进程请求使用密钥%%0A  %s%%0A  (%s)%%0A您想��许这一请求�？"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "�许"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "拒�"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "请输入 ssh 密钥 %%0A  %F%%0A  (%c)  的密�"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "请�新输入此密�"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -272,95 +292,90 @@ msgstr ""
 "请输入一个密�，以便于在 gpg-agent 的密钥存储中�护接收到的�钥 %%0A   %s"
 "%%0A   %s%%0A"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "从以下套接字创建�时失败： %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "请�入具有以下�列�的�"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "请移除当�的�并�入具有以下�列�的那一张"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "管�员 PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "�置�"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr "按下�片/令牌上的 ACK 按钮。"
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 msgid "Use the reader's pinpad for input."
 msgstr "使用读�器�键盘输入。"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "�次输入此�置�"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "�次输入此 PUK"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "�次输入此 PIN"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "�置��次输入时与首次输入�符；请�试"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK �次输入时与首次输入�符；请�试"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN �次输入时与首次输入�符；请�试"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "请输入 PIN%s%s%s 以解�这张�"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "创建临时文件时出现错误： %s\n"
-
-#: agent/genkey.c:152
+#: agent/genkey.c:157
 #, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "写入临时文件时出现错误： %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "写入管�时出现错误：%s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "输入新的密�"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "无论如何使用这个"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "您并没有输入一个密��%0A��许密�留空。"
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -369,176 +384,242 @@ msgstr ""
 "您并没有输入一个密� - 这通常�是一个好主��%0A请确认您�想给您的密钥加上任"
 "何的�护。"
 
-#: agent/genkey.c:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "是的，�护�是必须的"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, 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:296
+#: agent/genkey.c:282
 #, 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:323
+#: agent/genkey.c:309
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "密��应该是一个已知的用语或者与%%0A特定的模�相匹�。"
 
-#: agent/genkey.c:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告：您输入了一个�安全的密�。"
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "请输入密�以%0A�护您的新密钥"
 
-#: agent/genkey.c:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "请输入新的密�"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@选项:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+msgid "Options used for startup"
+msgstr "�动选项"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "以守护进程模��行 （��）"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "以�务进程模��行 （��）"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 msgid "run in supervised mode"
 msgstr "以管�进程模��行"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "详细模�"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "尽��少�示信�"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "请勿离开控制�"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "sh 风格的命令行输出"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "csh 风格的命令行输出"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|从 FILE 中读�选项"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "请勿离开控制�"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "控制诊断输出的选项"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "为�务器使用日志文件"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "详细模�"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|使用 PGM 作为 PIN-Entry 程�"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "尽��少�示信�"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|使用 PGM 作为 SCdaemon 程�"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|FILE|将�务器模�的日志写入到 FILE"
+
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "控制�置的选项"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "�使用 SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|使用 PGM 作为 SCdaemon 程�"
+
+#: agent/gpg-agent.c:213
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|通过 NAME 接收一些命令"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "忽略改� TTY 的请求"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "忽略改� X display 的请求"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "�用 ssh 支�"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr "|ALGO|使用 ALGO 显示 ssh 指纹"
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "�用 putty 支�"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "控制安全的选项"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|使被缓存的 PIN 在 N 秒�过期"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|在 N 秒�使 SSH 密钥过期"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|设置 PIN 缓存的生命周期为 N 秒"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|设置 SSH 缓存的生命周期为 N 秒"
+
+#: agent/gpg-agent.c:248
 msgid "do not use the PIN cache when signing"
 msgstr "在签�时�使用 PIN 缓存"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:250
 msgid "disallow the use of an external password cache"
 msgstr "�止使用外部的密�缓存"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "�止客户端将密钥标记为“信任�"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 msgid "allow presetting passphrase"
 msgstr "�许预设置的密�"
 
-#: agent/gpg-agent.c:253
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "选项强制�求一个密�策略"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "��许绕过密�的策略"
+
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|设置�求新密�的最短长度为 N"
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|N|�求新密�至少有 N 个�字�字符"
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|按 FILE 中的样�检查新密�"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|在 N 天�使密�过期"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "��许�次使用旧的密�"
+
+#: agent/gpg-agent.c:281
+msgid "Options controlling the PIN-Entry"
+msgstr "PIN-Entry 控制选项"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
+msgstr "�使用 PIN-entry"
+
+#: agent/gpg-agent.c:285
 msgid "disallow caller to override the pinentry"
 msgstr "�止调用者覆盖 pinentry"
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
-msgstr "�行密�通过 Emacs 回显"
+#: agent/gpg-agent.c:287
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr "�许 PIN-Entry 抓�键盘与鼠标"
 
-#: agent/gpg-agent.c:258
-msgid "enable ssh support"
-msgstr "�用 ssh 支�"
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|使用 PGM 作为 PIN-Entry 程�"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr "|ALGO|使用 ALGO 显示 ssh 指纹"
+#: agent/gpg-agent.c:294
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|设置 Pinentry 的超时时间为 N 秒"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "�用 putty 支�"
+#: agent/gpg-agent.c:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: 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:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "用法： @GPG_AGENT@ [选项] （-h 获�帮助）"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -546,135 +627,143 @@ msgstr ""
 "语法： @GPG_AGENT@ [选项] [命令 [�数]]\n"
 "@GNUPG@ �钥管�器\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "无效的调试级别‘%s’\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "从‘%s’读�选项\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "注�：‘%s’�被认为是一个选项\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法创建套接字： %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "套接字�称‘%s’太长\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
-msgstr ""
+msgstr "正�试从�行的 %s 处夺�套接字\\n\n"
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "有一个 gpg-agent 实例正在�行 - 无须�动新的实例\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "获�套接字 nonce 时出现错误\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "绑定套接字到 '%s' 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "无法设置‘%s’的��： %s\n"
 
-#: agent/gpg-agent.c:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在监�套接字‘%s’\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "无法创建目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目录‘%s’已创建\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "‘%s’的 stat() 方法失败：%s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "无法使用‘%s’作为家目录\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "在读� fd %d 上的 nonce 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "�柄 0x%lx 于文件�述符 %d �动\n"
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "�柄 0x%lx 于文件�述符 %d 终止\n"
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh �柄 0x%lx 于文件�述符 %d �动\n"
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh �柄 0x%lx 于文件�述符 %d 终止\n"
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect 方法失败：%s - 等待 1s\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已�止\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "此会�中没有 gpg-agent 实例�行\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@选项:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "用法： gpg-preset-passphrase [选项] KEYGRIP (-h 获�帮助)\n"
@@ -687,8 +776,8 @@ msgstr ""
 "语法： gpg-preset-passphrase [选项] KEYGRIP\n"
 "密�缓存管�\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -696,9 +785,8 @@ msgstr ""
 "@命令：\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -752,43 +840,43 @@ msgstr "已�消\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "请求密�时出现错误： %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "打开‘%s’时出现错误：%s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "文件‘%s’ 的第 %d 行：%s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "已忽略声明 “%s� ，其�于‘%s’的第 %d 行\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "系统信任列表 ‘%s’ ��用\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "错误的指纹，其�于 ‘%s’ 的第 %d 行\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "无效的密钥标记，其�于 ‘%s’ 的第 %d 行\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "读� ‘%s’ 的第 %d 行时出现错误：%s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "读��信任的根�书列表时出现错误\n"
@@ -801,18 +889,18 @@ msgstr "读��信任的根�书列表时出现错误\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "您�无�地信任%%0A  “%s�%%0A为正确的认�用户�书�?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "是"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "�"
@@ -825,7 +913,7 @@ msgstr "�"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -835,35 +923,35 @@ msgstr "请确认被识别为%%0A “%s�%%0A的�书具有以下的指纹：%
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "正确"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "错误"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "注�：此密�从未被修改过。%0A请立�修改。"
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr "此密�自从 %.4s-%.2s-%.2s 起未被修改过。%%0A请立�修改。"
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "更改密�"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "��修改"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -871,11 +959,11 @@ msgid ""
 msgstr ""
 "您真的想�删除这个被以下的 keygrip 所标识的密钥� %%0A  %s%%0A  %%C%%0A？"
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "删除密钥"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -908,7 +996,7 @@ msgstr "检查已建立的签�时�生错误： %s\n"
 msgid "secret key parts are not available\n"
 msgstr "�钥部分��用\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "�支�的公钥算法: %d (%s)\n"
@@ -923,52 +1011,52 @@ msgstr "�支�的�护算法: %d (%s)\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "�支�的�护散列算法: %d (%s)\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "创建管�时�生错误： %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "为管�创建�时出现错误： %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "在 fork 进程时出现错误： %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "等待进程 %d 终止时失败： %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "�行‘%s’时出现错误：�能未安装\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "�行‘%s’时出现错误：退出代� %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "�行‘%s’时出现错误：被终止\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, c-format
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "等待进程终止时失败： %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "获�进程 %d 的退出代�时出现错误： %s\n"
@@ -998,12 +1086,12 @@ msgstr "警告： %s 具有�安全的文件所有� “%s�\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告：%s 具有�安全的文件��� “%s�\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "等待 ‘%s’ �被访问...\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "将 ‘%s’ �命�为 ‘%s’ 时失败：%s\n"
@@ -1066,22 +1154,22 @@ msgstr "分� %lu 字节时安全内存�足"
 msgid "out of core while allocating %lu bytes"
 msgstr "分� %lu 字节时内存�足"
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "在分�足够的内存时出现错误： %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: 废弃的选项 \"%s\" - 此选项�会产生作用\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "警告： “%s%s� 是一个废弃的选项 - 此选项�会产生作用\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "未知的调试选项 ‘%s’ 已被忽略\n"
@@ -1381,7 +1469,7 @@ msgstr "无效的选项"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "选项 “%.50s� 的�数缺失\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "选项 “%.50s� 的�数无效\n"
@@ -1411,17 +1499,17 @@ msgstr "命令 “%.50s� �义模糊\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "无效的选项 “%.50s�\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "注�：没有默认�置文件‘%s’\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "选项文件‘%s’：%s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr "注�：由于全局�置，忽略选项 “--%s�\n"
@@ -1441,41 +1529,41 @@ msgstr "iconv_open 方法失败： %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "从 ‘%s’ 转�到 ‘%s’ 时失败：%s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "创建临时文件 ‘%s’ 失败： %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "写入 ‘%s’ 时出现错误： %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "移除旧的�文件 （由 %d 创建）\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "等待�（由 %d%s �有） %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "（死�？） "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "� ‘%s’ 未被建立： %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "等待� %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太旧 （需� %s，拥有 %s）\n"
@@ -1699,22 +1787,22 @@ msgstr "已清除�自�务器的��接�的 HTTP �定�"
 msgid "server uses an invalid certificate"
 msgstr "�务器�书无效"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, c-format
 msgid "Note: %s\n"
 msgstr "注�：%s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP ���用：%s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP �，��为 %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1730,8 +1818,8 @@ msgstr "这一命令�在版本 2 的�上�用\n"
 msgid "Reset Code not or not anymore available\n"
 msgstr "�置���用或���用\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1741,120 +1829,120 @@ msgstr "您的选择是？ "
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr "先生"
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr "女士"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "�强制"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "强制"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目���许使用纯 ASCII 字符。\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：�能使用字符 “<�。\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：��许出现两个空格。\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "�片�有人的姓： "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "�片�有人的�： "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：���的姓�太长（至多 %d 个字符）。\n"
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "拉�公钥的 URL： "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "读� ‘%s’ 时出现错误：%s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "写入 ‘%s’ 时出现错误： %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "登录数�（�户�）： "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "个人 DO 数�： "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "语言�好： "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：�好字符串长度无效。\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：�好字符串中存在无效字符。\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "称呼（M = 先生，F = 女士，或者留空)： "
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的�应。\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "CA 指纹： "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格�无效。\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "密钥�作无法实现：%s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "�是一个 OpenPGP �"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�得当�密钥信�时出错：%s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "替�现存的密钥？(y/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1864,97 +1952,97 @@ msgstr ""
 "      如果密钥生���功，请检查\n"
 "      �的�许密钥长度。\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想�使用的密钥长度？(%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�入到 %u �\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 密钥长度必须在 %u 与 %u 间\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr "正在改��片的密钥属性： "
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 msgid "Signature key\n"
 msgstr "签�密钥\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 msgid "Encryption key\n"
 msgstr "加密密钥\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 msgid "Authentication key\n"
 msgstr "身份验�密钥\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您�使用的密钥类型：\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "改�密钥 %d 的密钥属性时出现错误： %s\n"
 
-#: g10/card-util.c:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "获��片信�时出现错： %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "此命令�被此�片支�\n"
 
-#: g10/card-util.c:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "创建加密密钥的离�备份？ (Y/n) "
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "注�： 已有�钥被存储于�片上�\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "替�现存的密钥？(y/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1965,165 +2053,165 @@ msgstr ""
 "  PIN = ‘%s’    管�员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令�更改它们\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您�生�的密钥类型：\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签�密钥\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 身份验�密钥\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD 失败： %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "注�： 这一命令将会销�所有储存于�片上的�钥�\n"
 
-#: g10/card-util.c:1928
+#: g10/card-util.c:1938
 msgid "Continue? (y/N) "
 msgstr "继续？ (y/N) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "真的�执行��出厂设置�？ (输入“yes�) "
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "设置 KDF 时出现错误： %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "退出此��"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "显示管�员命令"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "显示此帮助"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "列出所有�用数�"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "更改��有人的姓�"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "更改拉�密钥的 URL"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "根��中指定的 URL 获�密钥"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "更改登录�"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "更改语言�好"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 msgid "change card holder's salutation"
 msgstr "�更�片�有人的称呼"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "切�签�强制使用 PIN 标志"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "生�新的密钥"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解� PIN 的��"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "验� PIN 并列出所有数�"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "使用�置�解� PIN"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr "销�所有密钥和数�"
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 msgid "setup KDF for PIN authentication"
 msgstr "针对 PIN 身份验�设置 KDF"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 msgid "change the key attribute"
 msgstr "更改密钥属性"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "仅供管�员使用的命令\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "管�员命令�用\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "管�员命令��用\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的命令  （�试“help�）\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中�起作用\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "无法打开 ‘%s’\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "未找到密钥 ‘%s’：%s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2182,8 +2270,8 @@ msgid "subkey"
 msgstr "�密钥"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
@@ -2223,24 +2311,24 @@ msgstr "由于在 S2K 模�，�能使用一个对称的 ESK �包\n"
 msgid "using cipher %s\n"
 msgstr "使用加密 %s\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "密文算法 ‘%s’ �能�能被用于 %s 模�\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "摘�算法‘%s’�能在 %s 模�下使用\n"
@@ -2261,45 +2349,51 @@ msgstr "警告： 强制对称密文 %s (%d) 与接收者的�好设置冲�\n
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "警告： 密钥 %s 在 %s 模�下�适用于加密\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr "未能满足�规规则，�作已强制�消\n"
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告： 强制压缩算法 %s (%d) 与接收者的�好设置冲�\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行对称密文算法 %s (%d) 与接收者的�好设置冲�\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已�加密给：“%s�\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "选项 ‘%s’ �能�能用于 %s 模�\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数�\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告： 消�使用了一个弱密钥以对称密文的形�加密\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "处�加密�包时出现问题\n"
@@ -2478,212 +2572,260 @@ msgstr "无效的密钥 %s 通过 --allow-non-selfsigned-uid 生效\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用�密钥 %s 而�主密钥 %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "选项 ‘%s’ 的有效值:\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "生�一份签�"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "生�一份明文签�"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "生�一份分离的签�"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "加密数�"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称密文加密"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "解密数�（默认）"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "验�签�"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "列出密钥和签�"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签�"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "列出�钥"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "生�一个新的密钥对"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "快速生�一个新的密钥对"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 msgid "quickly add a new user-id"
 msgstr "快速添加一个新的用户标识"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 msgid "quickly revoke a user-id"
 msgstr "快速�销一个用户标识"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 msgid "quickly set a new expiration date"
 msgstr "快速设置一个过期日期"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "完整功能的密钥对生�"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "生�一份�销�书"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "从�钥钥匙环里删除密钥"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "快速签�一个密钥"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "快速本地签�一个密钥"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "quickly revoke a key signature"
 msgstr "快速�销一个密钥签�"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "签�一个密钥"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "本地签�一个密钥"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "签�或编辑一个密钥"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "更改密�"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "将密钥导出到一个公钥�务器上"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "从公钥�务器上导入密钥"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "在公钥�务器上�索密钥"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "从公钥�务器更新所有密钥"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "导入/�并密钥"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "打��片状�"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "更改�片上的数�"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "更改�片的 PIN"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "更新信任数�库"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "打�消�摘�"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "以�务器模��行"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|设置一个密钥的 TOFU 政策"
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|使用 NAME 作为默认的�钥"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|�时给以 NAME 为�称的用户标识加密"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|设置电�邮件别�"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "使用严格的 OpenPGP 行为"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "��任何更改"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "覆盖��示"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+msgid "Options controlling the input"
+msgstr "输入控制选项"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+msgid "Options controlling the output"
+msgstr "输出控制选项"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "创建 ASCII 字符�装的输出"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|USER-ID|为 USER-ID 加密"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|写输出到 FILE"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|USER-ID|使用 USER-ID �签�或者解密"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "使用规范的文本模�"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|设置压缩等级为 N （0 为�用）"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "使用规范的文本模�"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+msgid "Options controlling key import and export"
+msgstr "密钥导入导出控制选项"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|FILE|写输出到 FILE"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|通过邮件地�定�密钥时使用机制 MECHANISMS"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "��任何更改"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "�用对 dirmngr 的所有访问"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "覆盖��示"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+msgid "Options controlling key listings"
+msgstr "密钥列出控制选项"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "使用严格的 OpenPGP 行为"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+msgid "Options to specify keys"
+msgstr "指定密钥选项"
+
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|为 USER-ID 加密"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|USER-ID|使用 USER-ID �签�或者解密"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr "无人值守选项"
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr "其他选项"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2691,7 +2833,7 @@ msgstr ""
 "@\n"
 "（请�考手册页以获得所有命令和选项的完整列表）\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2711,11 +2853,11 @@ msgstr ""
 " --list-keys [�字]        列出密钥\n"
 " --fingerprint [�字]      显示指纹\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "用法： @GPG@ [选项] [文件] (-h 获�帮助)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2725,7 +2867,7 @@ msgstr ""
 "签��检查�加密或解密\n"
 "默认的�作�输入数�而定\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2733,537 +2875,537 @@ msgstr ""
 "\n"
 "支�的算法：\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "公钥： "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "密文： "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "散列： "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "压缩：  "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "用法： %s [选项] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "冲�的指令\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "群组定义 ‘%s’ 中找�到 = 标志\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的所有��安全\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的所有��安全\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的所有��安全\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的����安全\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的����安全\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的����安全\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录所有��安全\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的上级目录所有��安全\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的上级目录所有��安全\n"
 
-#: g10/gpg.c:1660
+#: g10/gpg.c:1686
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录����安全\n"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的上级目录���安全\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的上级目录����安全\n"
 
-#: g10/gpg.c:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的�置项‘%s’\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示照片标识"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "列出密钥时显示用途信�"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "列出签�时显示策略 URL"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "列出签�时显示所有注记"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签�时显示 IETF 标准注记"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签�时显示用户�供的注记"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出签�时显示首选公钥�务器 URL"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已�销或已过期的用户标识"
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已�销或已过期的�密钥"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的�称"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "列出签�时显示过期日期"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的 TOFU 政策‘%s’\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "（使用“help��列出选择）\n"
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "��许在 %s 模�中使用此命令。\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注�：%s �适用于一般使用�\n"
 
-#: g10/gpg.c:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’�是一个有效的签�过期日期\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s� �是一个�适的邮件地�\n"
 
-#: g10/gpg.c:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "无效的 pinentry 模�‘%s’\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "无效的请求��‘%s’\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’�是一个有效的字符集\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "无法解�公钥�务器 URL\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥�务器选项\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥�务器选项\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "无效的过滤选项：%s\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "验�签�时显示照片标识"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "验�签�时显示策略 URL"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "验�签�时显示所有注记"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "验�签�时显示 IETF 标准注记"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "验�签�时显示用户�供的注记"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验�签�时显示首选公钥�务器 URL"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "验�签�时显示用户标识的有效性"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验�密钥时显示已�销或已过期的�钥"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr "在签�验�中�显示主�用户标识"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数�验�签�"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "��带有有效 PKA 数�的签�的信任度"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 无效的验�选项\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "无效的验�选项\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法设置�行路径为 %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s%d: 无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程��能会创建核心内存转储文件�\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 覆盖了 %s \n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ��许与 %s 并用\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用时�起作用\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告：正在以虚�的系统时间�行： "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�会在内存�安全的情况下�行，原因是 %s\n"
 
-#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的密文算法无效\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的�书散列算法无效\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "需�的完全�信签�数一定�大于 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需�的勉强�信签�数一定�大于 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最�认�级别（default-cert-level）；必须为 1，2 或 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注�：强烈�建议使用简�的 S2K 模� (0)\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模�；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "无效的默认�好设置\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人密文�好设置\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人摘�算法�好设置\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚�能和 %s 并用\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "压缩算法‘%s’�能在 %s 模�下使用\n"
 
-#: g10/gpg.c:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�始化信任度数�库失败：%s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了接收者（-r）但并未使用公钥加密\n"
 
-#: g10/gpg.c:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "您�能在使用 --symmetric --encrypt 时使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "您�能在 %s 模�下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "您�能在 %s 模�下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "��至公钥�务器失败：%s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥�务器接收失败：%s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "作为 ssh 密钥导出失败：%s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "公钥�务器�索失败：%s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "公钥�务器刷新失败：%s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开字符�装时失败：%s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行字符�装时失败：%s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "无效的散列算法‘%s’\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "解�密钥指定‘%s’时出现错误：%s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "‘%s’��是一个有效的密钥标识�指纹或者 keygrip\n"
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "警告：没有�供命令。正在�试猜测您的�图...\n"
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始输入您的消�…\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的�书策略 URL 无效\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签�策略 URL 无效\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥�务器 URL 无效\n"
@@ -3276,7 +3418,7 @@ msgstr "|FILE|从钥匙环 FILE 文件中�得密钥"
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳冲�仅视为警告"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状�信�写入文件�述符 FD"
 
@@ -3963,7 +4105,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您�然想�为它签��？(y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签�。\n"
 
@@ -4131,8 +4273,8 @@ msgstr "我�常�心地检查过这个密钥。\n"
 msgid "Really sign? (y/N) "
 msgstr "真的�签��？(y/N) "
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签�时失败： %s\n"
@@ -4321,7 +4463,7 @@ msgstr ""
 "  信任签�，‘nr’�缀（nrsign）进行���销签�，\n"
 "  或者上述三��缀的任�组�（ltsign�tnrsign 等）。\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "密钥已被�销。"
 
@@ -4369,7 +4511,7 @@ msgstr "真的�移除此用户标识�？(y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "真的�移动主密钥�？(y/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "您必须选择一个密钥。\n"
 
@@ -4443,177 +4585,177 @@ msgstr "��存�更�？(y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "���存而退出�？(y/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有�更所以�需�更新。\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "�能�销最�一个有效的用户标识。\n"
 
-#: g10/keyedit.c:2476
+#: g10/keyedit.c:2532
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "�销用户标识时出现错误：%s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "设置主�用户标识时出现错误：%s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" �是一个指纹\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“%s� �是主�指纹\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "无效的用户标识‘%s’：%s\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "没有匹�的用户标识。"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "没有�被签�的东西。\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "并�由您签�。\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "�销密钥签�失败：%s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’�是一个有效的过期时间\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s� �是一个正确的指纹\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "�密钥 “%s� 未找到\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr "AEAD： "
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "摘�： "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "特点： "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "公钥�务器��修改"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "首选公钥�务器： "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "注记： "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "没有关于 PGP 2.x 样�用户标识的�好设置。\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "下列密钥在 %s 被 %s 的密钥 %s 所�销\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这个密钥�被 %s 的密钥 %s �销"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "（�感的）"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "�销于：%s"
 
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "过期于：%s"
 
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "�用于：%s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "��： "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "这个密钥已�被�用"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注�，在您��程�之�，所显示的密钥有效性�一定正确。\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "已�销"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4622,17 +4764,17 @@ msgstr ""
 "警告： 没有用户标识被标记为主�。 此命令�能会\n"
 "              导致一个��的用户标识被�定为主�。\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "警告： 您的加密用�密钥将在�久�过期。\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "您�能也想��更它的过期日期。\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4641,70 +4783,70 @@ msgstr ""
 "警告：这是一个 PGP2 样�的密钥。增加照片标识�能会导致�些版本的\n"
 "     PGP 拒�这个密钥。\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定�然想�增加�？(y/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您��以把照片标识增加到 PGP2 样�的密钥里。\n"
 
-#: g10/keyedit.c:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "这样的用户标识已�存在于这个密钥上了�\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签��？(y/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签��？(y/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签��？(y/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的�删除这个自签��？(y/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "已�删除了 %d 个签�。\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识 “%s� 已被压缩：%s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "用户标识 “%s�：%d 个签�被移除\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识 “%s�：已被最�化\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识 “%s�：无用部分已清�\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4713,209 +4855,209 @@ msgstr ""
 "警告：这是一个 PGP2 样�的密钥。增加指定�销者\n"
 "     �能会导致�些版本的 PGP 无法识别这个密钥。\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您��以为 PGP 2.x 样�的密钥添加指定�销者。\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定�销者的用户标识： "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样�的密钥设为指定�销者\n"
 
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您�能将�把密钥设为它自己的指定�销者\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "这个密钥已被指派为一个�销者\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将�把密钥设置为指定�销者的�作无法撤销�\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定�将这个密钥设置为指定�销者�？(y/N)： "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "您确定�改�多个�密钥的过期时间�？ (y/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将��更�密钥的过期时间。\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将��更主密钥的过期时间。\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您�能�更 v3 密钥的过期时间\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 msgid "Changing usage of a subkey.\n"
 msgstr "�更一个�密钥的用途。\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 msgid "Changing usage of the primary key.\n"
 msgstr "�更主密钥的用途。\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签�的�密钥 %s 已�交�验�\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "�密钥 %s �签�，因此�需�被交�验�\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "请选定仅一个用户标识。\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识 “%s� 上的 v3 自签�\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选公钥�务器的 URL： "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定�替�它�？(y/N) "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定�删除它�？(y/N) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "输入注记： "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "没有属于密钥标识‘%s’的�密钥。\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的�密钥\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s�\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签�\n"
 
-#: g10/keyedit.c:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (��导出)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "此签�已在 %s 过期。\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您�然想��销它�？(y/N) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�为这份签�生�一份�销�书�？(y/N) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已�签��密钥 %s 上的这些用户标识：\n"
 
-#: g10/keyedit.c:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (���销)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s �销于 %s\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在�销这些签�：\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的�生��销�书�？(y/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "没有�钥\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "�试�销一个�用户标识：%s\n"
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识 “%s� 已�被�销。\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签�的日期标记为 %d 秒�的未�\n"
 
-#: g10/keyedit.c:6314
+#: g10/keyedit.c:6370
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "�能�销最�一个有效的用户标识。\n"
 
-#: g10/keyedit.c:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被�销。\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�密钥 %s 已被�销。\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 的照片标识，大� %ld，属于密钥 %s （用户标识 %d）\n"
@@ -5370,7 +5512,7 @@ msgstr ""
 "�生器有更好的机会获得足够的熵。\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "密钥生�失败：%s\n"
@@ -5439,11 +5581,11 @@ msgstr "无�写的公钥钥匙环：%s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时�生错误： %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和�钥已�生�并被签�。\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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"
@@ -5451,34 +5593,34 @@ msgstr ""
 "请注�这个密钥�能用于加密。您�能想�使用“--edit-key�命令�\n"
 "生�一个用于此用途的�密钥。\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥已�在 %lu 秒�的未�生�（�能是因为时空扭曲或时钟的问题）\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥已�在 %lu 秒�的未�生�（�能是因为时空扭曲或时钟的问题）\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注�：为 v3 密钥创建�密钥是�与 OpenPGP 兼容的\n"
 
-#: g10/keygen.c:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主密钥的�钥部分��用。\n"
 
-#: g10/keygen.c:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主密钥的�钥部分存储在�上。\n"
 
-#: g10/keygen.c:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "真的�创建�？(y/N) "
 
@@ -5679,82 +5821,82 @@ msgstr "正在从 %s 请求密钥\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获� URI %s：%s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "奇怪的加密会�密钥长度（%d）\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密过的会�密钥\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密�由未知的散列算法 %d 生�\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密数�：完好的数�加密密钥（DEK）\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u �的 %s 密钥加密，标识为 %s，生�于 %s\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s�\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密�密钥�为 %s\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "警告： 检测到多�纯文本\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密�加密\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密�加密\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "�定 %s 为加密过的数�\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 密文算法��用，�试使用 %s 代替\n"
 
-#: g10/mainproc.c:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：消�未�到完整性�护\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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"
@@ -5764,178 +5906,178 @@ msgstr ""
 "看起�此信�就是�法的。这是因为那个时候完整性\n"
 "�护还没有被广泛地采用。\n"
 
-#: g10/mainproc.c:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "无论如何使用选项‘%s’�解密。\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "解密强制失败�\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "解密�功\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已��造�\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "注�：��者�求您“�阅读�存盘�\n"
 
-#: g10/mainproc.c:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件� =‘%.*s’\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的�销�书 - 请使用“gpg --import��应用\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "未找到签�\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已��的签�，�自于 “%s�"
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签�，�自于 “%s�"
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签�，�自于 “%s�"
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "签�验�已被抑制\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处�此有歧义的签�数�\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签�建立于 %s\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签�，使用 %s，密钥� %s\n"
 
-#: g10/mainproc.c:2025
+#: g10/mainproc.c:2115
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               签�者 \"%s\"\n"
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "密钥在以下地方�用： "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "注�：使用 “%s� �使用此信�\n"
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[�确定]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦� “%s�"
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "警告： 此密钥在 %s 模�下�适用于签�\n"
 
-#: g10/mainproc.c:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签�已于 %s 过期。\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签�在 %s 过期。\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s 签�，摘�算法 %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "文本模�"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr "，密钥算法 "
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "警告：�是一个分离签�；文件‘%s’没有被验��\n"
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签�：%s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "�是一份分离的签�\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多�签�。�检查第一个签�。\n"
 
-#: g10/mainproc.c:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签�\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧�（PGP 2.x）签�\n"
@@ -6000,67 +6142,67 @@ msgstr "（已报告错误：%s <%s>）\n"
 msgid "(further info: "
 msgstr "（更多信�： "
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：被弃用的选项 “%s�\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s� 是一个已被弃用的选项\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请用“%s%s�代替\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s� 命令已被弃用 - ��使用它\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: “%s� 在此文件中已被淘汰 - 其仅在 %s 中起作用\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "警告：“%s%s�是一个已�被淘汰的选项 - 它除了在 %s 上之外�起作用\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "�压缩"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "此消��能�能被 %s 使用\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "ECDSA 公钥需�以 8 �的�数的 SEC 进行编�\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "未知的弱摘�‘%s’\n"
@@ -6093,22 +6235,22 @@ msgstr "正在写入到标准输出（stdout）\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "�定被签�的数�在‘%s’\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "无法�作公钥算法 %d\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在�安全的对称加密会�密钥\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, c-format
 msgid "Unknown critical signature notation: "
 msgstr "未知的紧急签�注记： "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类型的�包设定了紧急�\n"
@@ -6510,12 +6652,12 @@ msgstr "未知的默认接收者 “%s�\n"
 msgid "no valid addressees\n"
 msgstr "没有有效的地�\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "注�：密钥 %s 没有 %s 特性\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "注�：密钥 %s 没有关于 %s 的�好设置\n"
@@ -6778,7 +6920,7 @@ msgstr "密钥 %s 在 %s 模�中�适用于签�\n"
 #: g10/sig-check.c:82
 #, c-format
 msgid "continuing verification anyway due to option %s\n"
-msgstr ""
+msgstr "由于 %s 选项，验��在继续中\n"
 
 #: g10/sig-check.c:190
 #, c-format
@@ -6922,7 +7064,7 @@ msgstr "已跳过：�钥已存在\n"
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "这是一个由 PGP 生�的 ElGamal 密钥，其用于签�时�安全�"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
@@ -6967,7 +7109,7 @@ msgstr "在‘%s’中寻找信任度记录时出现错误：%s\n"
 msgid "read error in '%s': %s\n"
 msgstr "读�‘%s’时出现错误：%s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数�库：sync 失败：%s\n"
@@ -7445,142 +7587,142 @@ msgstr "警告：正在加密给 %s，其�具有���销的用户标识。
 msgid "'%s' is not a valid long keyID\n"
 msgstr "‘%s’�是一个有效的长格� keyID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "密钥 %s：接�为�信任的密钥\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "密钥 %s 在信任度数�库中出现多于一次\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "密钥 %s：�信任的密钥没有公钥 - 已跳过\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "密钥 %s 被标记为�对信任\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任记录 %lu，请求类别 %d：读�失败：%s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任记录 %lu �属于所请求的类别 %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "您�以通过下列命令�试�建信任度数�库：\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "如果那样�起作用，请查阅手册。\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "无法使用未知的信任模型（%d）- �定为 %s 信任模型\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "使用 %s 信任模型\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "�需�检查信任度数�库\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数�库检查将于 %s 进行\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "在‘%s’信任模型下无需进行 trustdb 检查\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "在‘%s’信任模型下无需进行 trustdb 更新\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "公钥 %s 未找到：%s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数�库\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "已处� %d 把密钥"
 
-#: g10/trustdb.c:2007
+#: g10/trustdb.c:2050
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " （%d 个有效计数已被清除）\n"
 
-#: g10/trustdb.c:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "未找到任何�对信任的密钥\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "�对信任密钥 %s 的公钥未找到\n"
 
-#: g10/trustdb.c:2209
+#: g10/trustdb.c:2252
 #, 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:2290
+#: g10/trustdb.c:2333
 #, 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 "�对"
 
@@ -7592,39 +7734,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 "[ �对 ]"
 
@@ -7672,33 +7814,33 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%s数字: %s%%0A�有者: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "剩余�试：%d"
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|请输入管�员 PIN"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|请输入标准密钥的 PIN 解��（PUK）。"
 
-#: scd/app-p15.c:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||请输入标准密钥的 PIN。"
 
@@ -7763,7 +7905,7 @@ msgstr "存储指纹失败：%s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "存储创建日期失败：%s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "从�片中拉� CHV 状�时出现错误\n"
@@ -7826,7 +7968,7 @@ msgstr "CHV%d 的 PIN 太短；最�长度为 %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "验� CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "�片被永久�定�\n"
@@ -7965,13 +8107,13 @@ msgstr "�片�支�摘�算法 %s\n"
 msgid "signatures created so far: %lu\n"
 msgstr "目�已创建的签�：%lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目��止通过此命令验�管�员 PIN\n"
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�能访问 %s - 无效的 OpenPGP �？\n"
@@ -7987,55 +8129,55 @@ msgstr "||请在读�器的�键盘上输入您的 PIN"
 msgid "|N|Initial New PIN"
 msgstr "|N|�始化新 PIN"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "正在以多�务器模��行（��）"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|设置调试级别至 LEVEL"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|将日志写入 FILE"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|连接到端� N 上的读�器"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|使用 NAME 作为 ct-API 驱动"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|使用 NAME 作为 PC/SC 驱动"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "�使用内置的 CCID 驱动"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|在 N 秒的�活跃之�断开�片的连接"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "�使用读�器的�键盘"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "拒�使用�片的管�员命令"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "使用�键盘的�长输入"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "拒�使用�片的管�员命令"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "用法：@SCDAEMON@ [选项] (-h 获�帮助)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8043,21 +8185,27 @@ msgstr ""
 "语法：scdaemon [选项] [命令 [�数]]\n"
 "@GNUPG@ 智能�守护进程\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "请使用‘--daemon’选项以在���行此程�\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d 的�柄已�动\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d 的�柄已关闭\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "获�密钥用途信�时出现错误：%s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8115,7 +8263,7 @@ msgstr "在外部�置查找签�者\n"
 msgid "number of issuers matching: %d\n"
 msgstr "匹�的签�者数目：%d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "无法获� authorityInfoAccess：%s\n"
@@ -8274,7 +8422,7 @@ msgstr "根�书未被标记为信任"
 msgid "checking the trust list failed: %s\n"
 msgstr "检查信任列表时失败：%s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "�书链过长\n"
@@ -8328,7 +8476,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "一个 %u �的散列对于一个 %u �的 %s 密钥是无效的\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8339,7 +8487,7 @@ msgstr "内存�足\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "（这是 MD2 算法）\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "none"
 
@@ -8373,42 +8521,37 @@ msgstr ""
 "S/N %s，ID 0x%08lX，\n"
 "创建于 %s，过期于 %s。\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "没有指定密钥用途 - �设为所有用途\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "获�密钥用途信�时出现错误：%s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "�书本�应被用于认�\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "�书本�应被用于认 OCSP �应签�\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "�书本�应被用于加密\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "�书本�应被用于签�\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "�书��用于加密\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "�书��用于签�\n"
@@ -8594,6 +8737,11 @@ msgstr "创建自签��书？ (y/N) "
 msgid "These parameters are used:\n"
 msgstr "这些�数被使用：\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "创建临时文件时出现错误： %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "现在正在创建自签��书。  "
@@ -8669,123 +8817,123 @@ msgstr "删除�书 “%s� 时失败：%s\n"
 msgid "no valid recipients given\n"
 msgstr "未指定有效的接收者\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "列出外部密钥"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "列出�书链"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "导入�书"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "导出�书"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "注册一张智能�"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "传递一�命令给 dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "调用 gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "创建 base-64 编�的输出"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "始终�使用终端"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|�包�的�书数目"
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|从 FILE 处获�策略信�"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "�定输入的是 PEM 格�"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "�定输入的是 base-64 格�"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "�定输入的是二进制格�"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "创建 base-64 编�的输出"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|使用 USER-ID 作为默认的�钥"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|添加钥匙环到钥匙环列表"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "获�缺失的签�者�书"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|对 PKCS#12 密�使用�为 NAME 的编�"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "从�查询 CRL"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "�对根�书检查 CRLs"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "使用 OCSP 检查有效性"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|�包�的�书数目"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|FILE|从 FILE 处获�策略信�"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "�检查�书策略"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "获�缺失的签�者�书"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "始终�使用终端"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|FILE|将�务器模�的日志写入到 FILE"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|使用�称为 NAME 的密文算法"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|FILE|将审计日志写入 FILE"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|使用以 NAME 命�的信�摘�算法"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "批处�模�：永�询问"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "在多数问题上�定回答为是"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "在多数问题上�定回答为�"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|FILE|添加钥匙环到钥匙环列表"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|USER-ID|使用 USER-ID 作为默认的�钥"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|使用此公钥�务器�查找密钥"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|使用�称为 NAME 的密文算法"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAME|使用以 NAME 命�的信�摘�算法"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|将审计日志写入 FILE"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "用法：@GPGSM@ [选项] [文件] (-h 获�帮助)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8795,27 +8943,27 @@ msgstr ""
 "使用 S/MIME �议以签��检查�加密或者解密\n"
 "默认�作�决于输入的数�\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "注�：将�加密给‘%s’：%s\n"
 
-#: sm/gpgsm.c:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "未知的验�模型‘%s’\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "正在导入通用�书‘%s’\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "无法使用‘%s’签�：%s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "无效的命令（�存在��的命令）\n"
@@ -8875,7 +9023,7 @@ msgstr "�新�索�书时出现问题：%s\n"
 msgid "error storing flags: %s\n"
 msgstr "存储选项时出现错误：%s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "错误 - "
 
@@ -8910,7 +9058,7 @@ msgstr ""
 "\n"
 "%s%s您真的确定您�这样��？"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -8958,23 +9106,23 @@ msgstr "[日期未指定]"
 msgid "algorithm:"
 msgstr "算法："
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr "无效的签�：消�摘�属性与计算得到的�匹�\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "良好签��自于"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "                亦�"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "这是一个�格的签�\n"
@@ -9752,112 +9900,135 @@ msgstr "需��对文件�\n"
 msgid "looking up '%s'\n"
 msgstr "正在查找‘%s’\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "列出 CRL 缓存的内容"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|从 FILE 中加载 CRL 到缓存"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|从 URL 处获� CRL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "关闭 dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "刷新缓存"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|FILE|将�务器模�的日志写入到 FILE"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr "�许在线软件版本检查"
 
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "在�询问用户的情况下�行"
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr "|N|在一次查询中最多返回 N 个项目"
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
-msgstr "强制载入过期的 CRLs"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr "网络相关选项"
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "�许�� OCSP 请求"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
+msgstr "通过 Tor 转�所有网络��"
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
-msgstr "�许在线软件版本检查"
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "公钥�务器的�置"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|使用 URL 处的密钥�务器"
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+msgstr "|FILE|为承载 HKP 的 TLS 使用 FILE 中的 CA �书"
+
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr "对 HTTP �务器的�置"
+
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "�止使用 HTTP �议"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "抑制 LDAP 的使用"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr "忽略 HTTP CRL 分�点"
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
-msgstr "忽略 LDAP CRL 分�点"
-
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "忽略�书包�的 OCSP �务 URLs"
-
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|�定� HTTP 请求到 URL"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "使用系统的 HTTP 代�设置"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "对�使用的 LDAP �务器的�置"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "抑制 LDAP 的使用"
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr "忽略 LDAP CRL 分�点"
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|使用 HOST 进行 LDAP 查询"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "使用 --ldap-proxy 选项以�使用回退主机"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|使用此公钥�务器�查找密钥"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|从 FILE 中读� LDAP �务器列表"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "添加从 CRL 分�点�现的新�务器到�务器列表"
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|设置 LDAP 超时时间为 N 秒"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "对于 OCSP 的�置"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "�许�� OCSP 请求"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "忽略�书包�的 OCSP �务 URLs"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|使用 URL 处的 OCSP �应者"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP �应由 FPR 签�"
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
-msgstr "|N|在一次查询中最多返回 N 个项目"
-
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr "|FILE|为承载 HKP 的 TLS 使用 FILE 中的 CA �书"
-
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
-msgstr "通过 Tor 转�所有网络��"
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "强制载入过期的 CRLs"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -9866,11 +10037,11 @@ msgstr ""
 "@\n"
 "(�阅 \"info\" 手册以获�一份所有命令�选项的完整列表)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "用法：@DIRMNGR@ [选项] (-h 获�帮助)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -9878,83 +10049,83 @@ msgstr ""
 "语法：@DIRMNGR@ [选项] [命令 [�数]]\n"
 "@GNUPG@ 的公钥�务器�CRL 和 OCSP 访问\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有效的调试等级为：%s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "用法：%s [选项] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "套接字�称中��许使用冒�\n"
 
-#: dirmngr/dirmngr.c:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处获� CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处处� CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 行太长 - 跳过\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 检测到无效指纹\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 读�错误：%s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 已忽略行尾部的垃圾数�\n"
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "接收到 SIGHUP 信� -正在�新读��置文件并刷新缓存\n"
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "接收到 SIGUSR2 信� - 未定义�进行的�作\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "接收到 SIGTERM 信� - 正在关闭...\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "接收到 SIGTERM 信� - �然有 %d 个活动的连接\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "强制关闭\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "收到 SIGINT 信� - 立�关闭\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "收到 %d 信� - 未定义�进行的�作\n"
@@ -10144,91 +10315,91 @@ msgstr "计算‘%s’的  OCSP 请求的散列时失败：%s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "并�由一个默认的 OCSP 签�者的�书签�"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "分�列表项时失败：%s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "获��应者 ID 时出现错误：%s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "未找到签�者�书：%s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "调用者没有返回目标�书\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "调用者没有返回签�的�书\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "分� OCSP 上下文时失败：%s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "未定义默认的 OCSP �应者\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "未定义默认的 OCSP 签�者\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "正在使用默认的 OCSP �应者‘%s’\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "正在使用 OCSP �应者‘%s’\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "获�目标�书的 OCSP 状�时出现错误：%s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "�书状�：%s  (当�=%s  下一个=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr "良好"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "�书已�被�销于： %s 原因是： %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP �应者返回了将�的状�\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP �应者返回了一个�当�的状�\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP 返回了一个太以�的状�\n"
@@ -10238,67 +10409,67 @@ msgstr "OCSP 返回了一个太以�的状�\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) 方法失败：%s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "�书 ID 中的�列�缺失"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire 方法失败：%s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url 方法失败：%s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "��数�时出现错误：%s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch 方法失败：%s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert 方法失败：%s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "超过设置的 max_replies %d\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "无法分�控制结构：%s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "分� assuan 上下文时失败：%s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "�始化�务器时失败：%s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "� Assuan 注册命令时失败：%s\n"
 
-#: dirmngr/server.c:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan 接�出现问题：%s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan 处�时失败：%s\n"
@@ -10341,7 +10512,7 @@ msgstr "�书链良好\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "�书本�应被用于 CRL 签�\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "�默"
 
@@ -10434,275 +10605,132 @@ msgstr "��行失败：%s\n"
 msgid "error sending standard options: %s\n"
 msgstr "��标准选项时出现错误：%s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "控制诊断输出的选项"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "控制�置的选项"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "对调试有用的选项"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "控制安全的选项"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|在 N 秒�使 SSH 密钥过期"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|设置 PIN 缓存的生命周期为 N 秒"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|设置 SSH 缓存的生命周期为 N 秒"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "选项强制�求一个密�策略"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "��许绕过密�的策略"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|设置�求新密�的最短长度为 N"
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr "|N|�求新密�至少有 N 个�字�字符"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|FILE|按 FILE 中的样�检查新密�"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|在 N 天�使密�过期"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "��许�次使用旧的密�"
-
-#: tools/gpgconf-comp.c:596
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|设置 Pinentry 的超时时间为 N 秒"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|使用 NAME 作为默认的�钥"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|NAME|�时给以 NAME 为�称的用户标识加密"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|设置电�邮件别�"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "公钥�务器的�置"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL|使用 URL 处的密钥�务器"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "�许 PKA 查询（DNS 请求）"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MECHANISMS|通过邮件地�定�密钥时使用机制 MECHANISMS"
-
-#: tools/gpgconf-comp.c:764
-msgid "import missing key from a signature"
-msgstr "从签�导入缺少的密钥"
-
-#: tools/gpgconf-comp.c:767
-msgid "include the public key in signatures"
-msgstr "在签�中包�公钥"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "�用对 dirmngr 的所有访问"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAME|对 PKCS#12 密�使用�为 NAME 的编�"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "�对根�书检查 CRLs"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "控制输出格�的选项"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "控制交互性和执行的选项"
-
-#: tools/gpgconf-comp.c:978
-msgid "Options controlling the use of Tor"
-msgstr "控制使用 Tor 的选项"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "对 HTTP �务器的�置"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "使用系统的 HTTP 代�设置"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "对�使用的 LDAP �务器的�置"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "LDAP �务器列表"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "对于 OCSP 的�置"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr "�钥"
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 msgid "Smartcards"
 msgstr "智能�"
 
-#: tools/gpgconf-comp.c:1101
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr "网络"
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 msgid "Passphrase Entry"
 msgstr "密��目"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "组件�适��动"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "组件 %s 的�置文件已��\n"
 
-#: tools/gpgconf-comp.c:1291
+#: tools/gpgconf-comp.c:831
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "注�：使用命令 “%s%s� 获�详情。\n"
 
-#: tools/gpgconf-comp.c:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "组件 %s 的外部验�失败"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "注�，群组规范已被忽略\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "关闭‘%s’时出现错误\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "处�‘%s’时出现错误\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "列出所有组件"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "检查所有程�"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|列出选项"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|�更选项"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|检查选项"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "应用全局默认值"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|使用 FILE 更新�置文件"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "为 @GPGCONF@ 获��置目录"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "列出全局�置文件"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "检查全局�置文件"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 msgid "query the software version database"
 msgstr "查询软件版本数�库"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "�新载入全部或者给定的组件"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "�动一个给定的组件"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "关闭一个给定的组件"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "若�能，在�行时激活�更"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "用法：@GPGCONF@ [选项] (-h 获�帮助)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10710,15 +10738,15 @@ msgstr ""
 "语法 @GPGCONF@ [选项]\n"
 "管� @GNUPG@ 系统的工具的�置选项 \n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "需�一个组件�数"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "组件未找到"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "没有�数被�许"
 
@@ -10734,6 +10762,36 @@ msgstr ""
 "语法：gpg-check-pattern [选项] patternfile\n"
 "按照 patternfile 检查一个由标准输入（stdin）给定的密�\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "写入临时文件时出现错误： %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "为�务器使用日志文件"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|FILE|将�务器模�的日志写入到 FILE"
+
+#~ msgid "run without asking a user"
+#~ msgstr "在�询问用户的情况下�行"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "�许 PKA 查询（DNS 请求）"
+
+#~ msgid "import missing key from a signature"
+#~ msgstr "从签�导入缺少的密钥"
+
+#~ msgid "include the public key in signatures"
+#~ msgstr "在签�中包�公钥"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "控制输出格�的选项"
+
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "控制使用 Tor 的选项"
+
+#~ msgid "LDAP server list"
+#~ msgstr "LDAP �务器列表"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "正在请求密钥 %s 从 %s �务器 %s\n"
 
@@ -10902,9 +10960,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "�能为写入打开 %s ：%s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "写入 %s 时出现错误：%s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "读� %s 时出现错误：%s\n"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 5036736..d6d762c 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 56c0643..98f5bac 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-11-23 10:54+0100\n"
+"POT-Creation-Date: 2022-08-24 15:33+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"
@@ -151,8 +151,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "密語:"
 
-#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693
-#: agent/command-ssh.c:3140 agent/genkey.c:461
+#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676
+#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447
 msgid "does not match - try again"
 msgstr "�後�一致 - 請�試一次"
 
@@ -197,63 +197,92 @@ msgstr "�良的個人識別碼 (PIN)"
 msgid "Bad Passphrase"
 msgstr "�良的密語"
 
+#: agent/command.c:654
+msgid "Note: Request from the web browser."
+msgstr ""
+
+#: agent/command.c:655
+msgid "Note: Request from a remote site."
+msgstr ""
+
+#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437
+#: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697
+#: g10/card-util.c:718 g10/skclist.c:435
+#, c-format
+msgid "error getting serial number of card: %s\n"
+msgstr "�得此�片�號時出錯: %s\n"
+
+#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079
+#: agent/genkey.c:382
+msgid "Please re-enter this passphrase"
+msgstr "請�次輸入密語"
+
+#: agent/command.c:2423
+#, fuzzy, c-format
+#| msgid ""
+#| "Please enter the passphrase to protect the imported object within the "
+#| "GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the %s "
+"system."
+msgstr "請輸入密語以�護匯入至 GnuPG 系統內的物件."
+
+#: agent/command.c:2553
+msgid ""
+"This key (or subkey) is not protected with a passphrase.  Please enter a new "
+"passphrase to export it."
+msgstr ""
+
 #: agent/command-ssh.c:665 agent/command-ssh.c:754
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支�大於 %d �元的 ssh 金鑰\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:852 g10/card-util.c:938
-#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1372 g10/keygen.c:4998
+#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947
+#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1398 g10/keygen.c:4998
 #: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008
 #: g10/sign.c:1322 g10/tdbio.c:753
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "無法建立 '%s': %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:895
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1373
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:543 g10/gpg.c:1399
 #: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036
 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128
 #: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306
 #: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2132
-#: sm/gpgsm.c:2162 sm/gpgsm.c:2200 sm/qualified.c:66 dirmngr/certcache.c:405
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160
+#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:405
 #: dirmngr/certcache.c:487 dirmngr/certcache.c:489 dirmngr/crlcache.c:2588
-#: dirmngr/dirmngr.c:1811
+#: dirmngr/dirmngr.c:1805
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "無法開啟 '%s': %s\n"
 
-#: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:688 g10/card-util.c:709
-#: g10/skclist.c:435
-#, c-format
-msgid "error getting serial number of card: %s\n"
-msgstr "�得此�片�號時出錯: %s\n"
-
-#: agent/command-ssh.c:2435
+#: agent/command-ssh.c:2441
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "�測到�片, 其�號為: %s\n"
 
-#: agent/command-ssh.c:2440
+#: agent/command-ssh.c:2446
 #, c-format
 msgid "no authentication key for ssh on card: %s\n"
 msgstr "�片上沒有 ssh 用的�證金鑰: %s\n"
 
-#: agent/command-ssh.c:2460
+#: agent/command-ssh.c:2466
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "找�到��的�片金鑰: %s\n"
 
-#: agent/command-ssh.c:2587
+#: agent/command-ssh.c:2598
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "�得已存放的旗標時出錯: %s\n"
 
-#: agent/command-ssh.c:2775
+#: agent/command-ssh.c:2786
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -261,24 +290,20 @@ msgid ""
 msgstr ""
 "有�個 ssh 程��出使用金鑰 %%0A  %s%%0A  (%s)%%0A 之請求, 請�是��許?"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Allow"
 msgstr "�許"
 
-#: agent/command-ssh.c:2782
+#: agent/command-ssh.c:2793
 msgid "Deny"
 msgstr "拒絕"
 
-#: agent/command-ssh.c:2791
+#: agent/command-ssh.c:2802
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "請輸入此 ssh 金鑰的密語 %%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3068 agent/genkey.c:396
-msgid "Please re-enter this passphrase"
-msgstr "請�次輸入密語"
-
-#: agent/command-ssh.c:3095
+#: agent/command-ssh.c:3106
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -286,97 +311,93 @@ msgid ""
 msgstr ""
 "請輸入密語以�護收到的�鑰 %%0A   %s%%0A   %s%%0A 於 gpg-agent 的金鑰存放處"
 
-#: agent/command-ssh.c:3677
+#: agent/command-ssh.c:3689
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "從 socket 建立串�失敗: %s\n"
 
-#: agent/divert-scd.c:117
+#: agent/divert-scd.c:205
 msgid "Please insert the card with serial number"
 msgstr "請�入下列�號的�片:"
 
-#: agent/divert-scd.c:118
+#: agent/divert-scd.c:206
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "請移除�用中的�片並�入下列�號的�片:"
 
-#: agent/divert-scd.c:246
+#: agent/divert-scd.c:335
 msgid "Admin PIN"
 msgstr "管�者個人識別碼 (PIN)"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:251
+#: agent/divert-scd.c:340
 msgid "PUK"
 msgstr "PIN �設碼 (PUK)"
 
-#: agent/divert-scd.c:258
+#: agent/divert-scd.c:347
 msgid "Reset Code"
 msgstr "�設碼"
 
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:375
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:308 agent/divert-scd.c:312
+#: agent/divert-scd.c:397 agent/divert-scd.c:401
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0A使用讀�機的�盤來輸入."
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:467
 msgid "Repeat this Reset Code"
 msgstr "請�次輸入�設碼"
 
-#: agent/divert-scd.c:380
+#: agent/divert-scd.c:469
 msgid "Repeat this PUK"
 msgstr "請�次輸入 PUK"
 
-#: agent/divert-scd.c:381
+#: agent/divert-scd.c:470
 msgid "Repeat this PIN"
 msgstr "請�次輸入個人識別碼 (PIN)"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:475
 msgid "Reset Code not correctly repeated; try again"
 msgstr "�後兩次輸入的�設碼�一致; 請�試一次"
 
-#: agent/divert-scd.c:388
+#: agent/divert-scd.c:477
 msgid "PUK not correctly repeated; try again"
 msgstr "�後兩次輸入的 PUK �一致; 請�試一次"
 
-#: agent/divert-scd.c:389
+#: agent/divert-scd.c:478
 msgid "PIN not correctly repeated; try again"
 msgstr "�後兩次輸入的個人識別碼 (PIN) �一致; 請�試一次"
 
-#: agent/divert-scd.c:402
+#: agent/divert-scd.c:491
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "請輸入個人識別碼 (PIN)%s%s%s 以解開�片"
 
-#: agent/genkey.c:144 sm/certreqgen-ui.c:432
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "建立暫存檔時出錯: %s\n"
-
-#: agent/genkey.c:152
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "寫入暫存檔時出錯: %s\n"
+#: agent/genkey.c:157
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "寫入 %s 時出錯: %s\n"
 
-#: agent/genkey.c:196 agent/genkey.c:202
+#: agent/genkey.c:182 agent/genkey.c:188
 msgid "Enter new passphrase"
 msgstr "請輸入新密語"
 
-#: agent/genkey.c:210
+#: agent/genkey.c:196
 msgid "Take this one anyway"
 msgstr "無論如何還是�用這個"
 
-#: agent/genkey.c:246
+#: agent/genkey.c:232
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "你還沒有輸入密語!%0A空密語是�行的."
 
-#: agent/genkey.c:248
+#: agent/genkey.c:234
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -385,181 +406,255 @@ msgstr ""
 "你還沒有輸入密語 - 通常這��是個好主�!%0A請確�你�想��你的金鑰�任何�"
 "è­·."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:246
 msgid "Yes, protection is not needed"
 msgstr "是, �需�任何�護"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:263
 #, 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:296
+#: agent/genkey.c:282
 #, 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:323
+#: agent/genkey.c:309
 #, 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:338
+#: agent/genkey.c:324
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告: 你輸入了�安全的密語."
 
-#: agent/genkey.c:527
+#: agent/genkey.c:513
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "請輸入密語至%0A以�護你的新金鑰"
 
-#: agent/genkey.c:653
+#: agent/genkey.c:639
 msgid "Please enter the new passphrase"
 msgstr "請輸入新的密語"
 
-#: agent/gpg-agent.c:166 agent/preset-passphrase.c:75 scd/scdaemon.c:115
-#: tools/gpg-check-pattern.c:66
-msgid ""
-"@Options:\n"
-" "
-msgstr ""
-"@�項:\n"
-" "
+#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:184
+#, fuzzy
+#| msgid "Options useful for debugging"
+msgid "Options used for startup"
+msgstr "�除錯有幫助的�項"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:120 dirmngr/dirmngr.c:169
+#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:173
 msgid "run in daemon mode (background)"
 msgstr "以�務模�執行 (背景)"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:117 dirmngr/dirmngr.c:168
+#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:172
 msgid "run in server mode (foreground)"
 msgstr "以伺�器模�執行 (�景)"
 
-#: agent/gpg-agent.c:171 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:175
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "以伺�器模�執行"
 
-#: agent/gpg-agent.c:173 g10/gpg.c:608 g10/gpgv.c:78 kbx/kbxutil.c:88
-#: scd/scdaemon.c:121 sm/gpgsm.c:312 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:184 tools/gpg-connect-agent.c:78 tools/gpgconf.c:109
-msgid "verbose"
-msgstr "囉唆模�"
-
-#: agent/gpg-agent.c:174 g10/gpgv.c:79 kbx/kbxutil.c:89 scd/scdaemon.c:122
-#: sm/gpgsm.c:313 dirmngr/dirmngr-client.c:71 dirmngr/dirmngr.c:185
-msgid "be somewhat more quiet"
-msgstr "盡�安�些"
+#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
+msgid "do not detach from the console"
+msgstr "��從 console 分離"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "sh-style command output"
 msgstr "sh 樣�的指令輸出"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:188
 msgid "csh-style command output"
 msgstr "csh 樣�的指令輸出"
 
-#: agent/gpg-agent.c:178 scd/scdaemon.c:125 sm/gpgsm.c:345
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410
+#: dirmngr/dirmngr.c:191
 msgid "|FILE|read options from FILE"
 msgstr "|檔案|從指定檔案中讀��項"
 
-#: agent/gpg-agent.c:187 scd/scdaemon.c:135 dirmngr/dirmngr.c:191
-msgid "do not detach from the console"
-msgstr "��從 console 分離"
+#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259
+#: dirmngr/dirmngr.c:195
+msgid "Options controlling the diagnostic output"
+msgstr "控制著診斷性輸出的�項"
 
-#: agent/gpg-agent.c:192
-msgid "use a log file for the server"
-msgstr "為伺�器使用日誌檔"
+#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70
+#: dirmngr/dirmngr.c:197 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110
+msgid "verbose"
+msgstr "囉唆模�"
 
-#: agent/gpg-agent.c:194
-msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|使用 PGM �為 PIN-Entry 程�"
+#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71
+#: dirmngr/dirmngr.c:198
+msgid "be somewhat more quiet"
+msgstr "盡�安�些"
 
-#: agent/gpg-agent.c:201
-msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|使用 PGM �為 SCdaemon 程�"
+#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:208
+msgid "|FILE|write server mode logs to FILE"
+msgstr "|檔案|將伺�器模�日誌寫入至指定檔案"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283
+#: dirmngr/dirmngr.c:212
+msgid "Options controlling the configuration"
+msgstr "控制著組態的�項"
+
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "��使用 SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
+msgid "|PGM|use PGM as the SCdaemon program"
+msgstr "|PGM|使用 PGM �為 SCdaemon 程�"
+
+#: agent/gpg-agent.c:213
 #, fuzzy
 #| msgid "|NAME|connect to host NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|�稱|連線至�於指定�稱的主機"
 
-#: agent/gpg-agent.c:223
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the TTY"
 msgstr "忽略變更 TTY 的�求"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the X display"
 msgstr "忽略變更 X display 的�求"
 
-#: agent/gpg-agent.c:228
+#: agent/gpg-agent.c:220
+msgid "enable ssh support"
+msgstr "啟用 ssh 支�"
+
+#: agent/gpg-agent.c:222
+msgid "|ALGO|use ALGO to show ssh fingerprints"
+msgstr ""
+
+#: agent/gpg-agent.c:225
+msgid "enable putty support"
+msgstr "啟用 putty 支�"
+
+#: agent/gpg-agent.c:237 g10/gpg.c:829 scd/scdaemon.c:175 sm/gpgsm.c:369
+msgid "Options controlling the security"
+msgstr "控制著安全性的�項"
+
+#: agent/gpg-agent.c:240
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|讓快��的個人識別碼 (PIN) 在 N 秒後到期"
 
+#: agent/gpg-agent.c:242
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|在 N 秒之後讓 SSH 金鑰�期"
+
 #: agent/gpg-agent.c:244
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|把個人識別碼 (PIN) 快�最大生存時間設� N 秒"
+
+#: agent/gpg-agent.c:246
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|把 SSH 金鑰最大生存時間設� N 秒"
+
+#: agent/gpg-agent.c:248
 msgid "do not use the PIN cache when signing"
 msgstr "簽署時��使用個人識別碼 (PIN) 快�"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:250
 #, 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:252
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "��許用戶端將金鑰標記為 \"已信任\""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:257
 msgid "allow presetting passphrase"
 msgstr "�許�先設定密語"
 
-#: agent/gpg-agent.c:253
-msgid "disallow caller to override the pinentry"
+#: agent/gpg-agent.c:262
+msgid "Options enforcing a passphrase policy"
+msgstr "強制執行密語原則的�項"
+
+#: agent/gpg-agent.c:265
+msgid "do not allow bypassing the passphrase policy"
+msgstr "��許略�密語原則"
+
+#: agent/gpg-agent.c:267
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|把新密語所需的最短長度設� N"
+
+#: agent/gpg-agent.c:269
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|N|新密語至少�有 N 個�字�的字符"
+
+#: agent/gpg-agent.c:272
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|檔案|用指定檔案中的樣�來檢查新密語"
+
+#: agent/gpg-agent.c:276
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|在 N 天之後讓密語�期"
+
+#: agent/gpg-agent.c:278
+msgid "do not allow the reuse of old passphrases"
+msgstr "��許�複使用舊密語"
+
+#: agent/gpg-agent.c:281
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the PIN-Entry"
+msgstr "控制著安全性的�項"
+
+#: agent/gpg-agent.c:283
+msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:256
-msgid "allow passphrase to be prompted through Emacs"
+#: agent/gpg-agent.c:285
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:258
-msgid "enable ssh support"
-msgstr "啟用 ssh 支�"
+#: agent/gpg-agent.c:287
+#, fuzzy
+#| msgid "do not grab keyboard and mouse"
+msgid "let PIN-Entry grab keyboard and mouse"
+msgstr "��奪��盤�滑鼠"
 
-#: agent/gpg-agent.c:260
-msgid "|ALGO|use ALGO to show ssh fingerprints"
-msgstr ""
+#: agent/gpg-agent.c:290
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|使用 PGM �為 PIN-Entry 程�"
 
-#: agent/gpg-agent.c:263
-msgid "enable putty support"
-msgstr "啟用 putty 支�"
+#: agent/gpg-agent.c:294
+#, 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:298
+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:542 agent/preset-passphrase.c:100 agent/protect-tool.c:155
-#: g10/gpg.c:1086 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:299
-#: sm/gpgsm.c:574 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:422
-#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:153
+#: agent/gpg-agent.c:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155
+#: g10/gpg.c:1106 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313
+#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:456
+#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "翻譯瑕疵請回報給 <Jedi@Jedi.org>, 程�瑕疵則請回報給 <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:551
+#: agent/gpg-agent.c:572
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "用法: @GPG_AGENT@ [�項] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:553
+#: agent/gpg-agent.c:574
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -567,136 +662,144 @@ msgstr ""
 "語法: @GPG_AGENT@ [�項] [指令 [引數]]\n"
 "@GNUPG@ �鑰管�\n"
 
-#: agent/gpg-agent.c:598 g10/gpg.c:1282 scd/scdaemon.c:371 sm/gpgsm.c:722
-#: dirmngr/dirmngr.c:506
+#: agent/gpg-agent.c:619 g10/gpg.c:1302 scd/scdaemon.c:385 sm/gpgsm.c:748
+#: dirmngr/dirmngr.c:540
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "給定的除錯等級 '%s' 無效\n"
 
-#: agent/gpg-agent.c:964 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1538
-#: sm/gpgsm.c:1544
+#: agent/gpg-agent.c:988 g10/gpg.c:3808 g10/gpg.c:3832 sm/gpgsm.c:1585
+#: sm/gpgsm.c:1591
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所�的摘�演算法無效\n"
 
-#: agent/gpg-agent.c:1187 agent/gpg-agent.c:2047 common/argparse.c:1755
-#: common/argparse.c:1847 g10/gpg.c:2512 scd/scdaemon.c:533 sm/gpgsm.c:981
-#: dirmngr/dirmngr.c:1031 dirmngr/dirmngr.c:1936
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766
+#: common/argparse.c:1858 g10/gpg.c:2515 scd/scdaemon.c:547 sm/gpgsm.c:1007
+#: dirmngr/dirmngr.c:1074 dirmngr/dirmngr.c:1930
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "從 '%s' 讀��項中\n"
 
-#: agent/gpg-agent.c:1304 g10/gpg.c:3751 scd/scdaemon.c:657 sm/gpgsm.c:1477
-#: dirmngr/dirmngr.c:1140 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:676
+#: agent/gpg-agent.c:1332 g10/gpg.c:3749 scd/scdaemon.c:671 sm/gpgsm.c:1522
+#: dirmngr/dirmngr.c:1183 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "請注�: '%s' 並�當��項\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1098 dirmngr/dirmngr.c:1294
+#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1337
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1111 dirmngr/dirmngr.c:1307
+#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1350
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket �稱 '%s' 太長\n"
 
-#: agent/gpg-agent.c:2238
+#: agent/gpg-agent.c:2220
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244
+#: agent/gpg-agent.c:2226
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - �會�啟動一份新的\n"
 
-#: agent/gpg-agent.c:2256 scd/scdaemon.c:1135 dirmngr/dirmngr.c:1343
+#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1386
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket �得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:2261 scd/scdaemon.c:1138 dirmngr/dirmngr.c:1346
+#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1389
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "�定 socket 至 '%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:2272 agent/gpg-agent.c:2312 agent/gpg-agent.c:2321
-#: scd/scdaemon.c:1146 dirmngr/dirmngr.c:1355
+#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303
+#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1398
 #, 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:2286 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1367
+#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在候� socket '%s'\n"
 
-#: agent/gpg-agent.c:2306 agent/gpg-agent.c:2359 common/homedir.c:760
+#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741
 #: g10/exec.c:269 g10/openfile.c:397
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "無法建立目錄 '%s': %s\n"
 
-#: agent/gpg-agent.c:2309 agent/gpg-agent.c:2364 common/homedir.c:763
+#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744
 #: g10/openfile.c:400
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目錄 '%s' 已建立\n"
 
-#: agent/gpg-agent.c:2370
+#: agent/gpg-agent.c:2352
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s' 的 stat() 失敗: %s\n"
 
-#: agent/gpg-agent.c:2374
+#: agent/gpg-agent.c:2356
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "無法使用 '%s' �為家目錄\n"
 
-#: agent/gpg-agent.c:2532 scd/scdaemon.c:1174 dirmngr/dirmngr.c:2142
+#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2136
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "於 fd %d 讀� nonce 時出錯: %s\n"
 
-#: agent/gpg-agent.c:2739
+#: agent/gpg-agent.c:2721
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "經手程� 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:2744
+#: agent/gpg-agent.c:2726
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "經手程� 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:2819
+#: agent/gpg-agent.c:2801
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 經手程� 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:2824
+#: agent/gpg-agent.c:2806
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程� 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:3046 scd/scdaemon.c:1366 dirmngr/dirmngr.c:2356
+#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2350
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_select 失敗: %s - 等 1 秒�\n"
 
-#: agent/gpg-agent.c:3134 scd/scdaemon.c:1431
+#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已�止\n"
 
-#: agent/gpg-agent.c:3272 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
+#: agent/preset-passphrase.c:75 tools/gpg-check-pattern.c:66
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@�項:\n"
+" "
+
 #: agent/preset-passphrase.c:104
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "用法: gpg-preset-passphrase [�項] 金鑰鑰柄 (或用 -h 求助)\n"
@@ -709,8 +812,8 @@ msgstr ""
 "語法: gpg-preset-passphrase [�項] 金鑰鑰柄\n"
 "密碼快�維護\n"
 
-#: agent/protect-tool.c:108 g10/gpg.c:440 kbx/kbxutil.c:71 sm/gpgsm.c:206
-#: dirmngr/dirmngr.c:166 tools/gpgconf.c:79
+#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210
+#: dirmngr/dirmngr.c:170 tools/gpgconf.c:80
 msgid ""
 "@Commands:\n"
 " "
@@ -718,9 +821,8 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: agent/protect-tool.c:117 g10/gpg.c:553 g10/gpgv.c:76 kbx/kbxutil.c:81
-#: sm/gpgsm.c:254 dirmngr/dirmngr.c:182 tools/gpg-connect-agent.c:76
-#: tools/gpgconf.c:106
+#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81
+#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107
 msgid ""
 "@\n"
 "Options:\n"
@@ -774,43 +876,43 @@ msgstr "已�消\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "詢�密語時出錯: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:364 dirmngr/dirmngr.c:1708
-#: tools/gpgconf.c:469
+#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1702
+#: tools/gpgconf.c:470
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "開啟 '%s' 時出錯: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "檔案 '%s', 第 %d 列: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "陳述� \"%s\" 忽略於 '%s', 第 %d 列\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "沒有系統信任清單 '%s' �用\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "�良的指紋於 '%s', 第 %d 列\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "無效的金鑰旗標於 '%s', 第 %d 列\n"
 
-#: agent/trustlist.c:317 common/helpfile.c:136
+#: agent/trustlist.c:335 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "讀� '%s' 時出錯, 第 %d 列: %s\n"
 
-#: agent/trustlist.c:436 agent/trustlist.c:505
+#: agent/trustlist.c:460 agent/trustlist.c:529
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "讀�已信任根憑證清單時出錯\n"
@@ -823,18 +925,18 @@ msgstr "讀�已信任根憑證清單時出錯\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:667
+#: agent/trustlist.c:691
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "請�你是�徹底信任%%0A  \"%s\"%%0A正確驗證使用者憑證的能力?"
 
-#: agent/trustlist.c:676 common/audit.c:467
+#: agent/trustlist.c:700 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:676 agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -847,7 +949,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:710
+#: agent/trustlist.c:734
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -857,35 +959,35 @@ msgstr "請驗證憑證與此完全相�:%%0A  \"%s\"%%0A其指紋為:%%0A  %s"
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Correct"
 msgstr "正確"
 
-#: agent/trustlist.c:724
+#: agent/trustlist.c:748
 msgid "Wrong"
 msgstr "錯了"
 
-#: agent/findkey.c:301
+#: agent/findkey.c:411
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "請注�: 密語從未變更�.%0A請�在就變更."
 
-#: agent/findkey.c:317
+#: agent/findkey.c:427
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr "密語從下列時刻起就沒有變更�:%%0A%.4s-%.2s-%.2s.  請�在就變更."
 
-#: agent/findkey.c:331 agent/findkey.c:338
+#: agent/findkey.c:441 agent/findkey.c:448
 msgid "Change passphrase"
 msgstr "更改密語"
 
-#: agent/findkey.c:339
+#: agent/findkey.c:449
 msgid "I'll change it later"
 msgstr "我�後�變更"
 
-#: agent/findkey.c:1522
+#: agent/findkey.c:1656
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -893,11 +995,11 @@ msgid ""
 "%%0A?"
 msgstr "你真的想�刪除所�的金鑰嗎? (y/N) "
 
-#: agent/findkey.c:1546 agent/findkey.c:1560
+#: agent/findkey.c:1680 agent/findkey.c:1694
 msgid "Delete key"
 msgstr "刪除金鑰"
 
-#: agent/findkey.c:1557
+#: agent/findkey.c:1691
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -930,7 +1032,7 @@ msgstr "檢查已建立的簽章時出錯: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "�鑰部分無法�用\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1556
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "公鑰演算法 %d (%s) 未支�\n"
@@ -945,53 +1047,53 @@ msgstr "�護演算法 %d (%s) 未支�\n"
 msgid "protection hash algorithm %d (%s) is not supported\n"
 msgstr "�護雜湊演算法 %d (%s) 未支�\n"
 
-#: common/exechelp-posix.c:359 common/exechelp-w32.c:451
+#: common/exechelp-posix.c:368 common/exechelp-w32.c:451
 #: common/exechelp-w32.c:475 common/exechelp-w32.c:505
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "建立管�時出錯: %s\n"
 
-#: common/exechelp-posix.c:372 common/exechelp-w32.c:355
+#: common/exechelp-posix.c:381 common/exechelp-w32.c:355
 #: common/exechelp-w32.c:461 common/exechelp-w32.c:485
 #: common/exechelp-w32.c:515
 #, c-format
 msgid "error creating a stream for a pipe: %s\n"
 msgstr "建立管�串�時出錯: %s\n"
 
-#: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:856 dirmngr/dirmngr.c:1385
+#: common/exechelp-posix.c:504 common/exechelp-posix.c:579
+#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1428
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "�生執行程�時出錯: %s\n"
 
-#: common/exechelp-posix.c:669 common/exechelp-w32ce.c:767
+#: common/exechelp-posix.c:678 common/exechelp-w32ce.c:767
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "等候 %d 處�程�終止時失敗: %s\n"
 
-#: common/exechelp-posix.c:678 common/exechelp-posix.c:799
+#: common/exechelp-posix.c:687 common/exechelp-posix.c:808
 #, c-format
 msgid "error running '%s': probably not installed\n"
 msgstr "執行 '%s' 時出錯: �能尚未安�\n"
 
-#: common/exechelp-posix.c:684 common/exechelp-posix.c:806
-#: common/exechelp-w32.c:829 common/exechelp-w32ce.c:781
+#: common/exechelp-posix.c:693 common/exechelp-posix.c:815
+#: common/exechelp-w32.c:832 common/exechelp-w32ce.c:781
 #, c-format
 msgid "error running '%s': exit status %d\n"
 msgstr "執行 '%s' 時出錯: ��狀態 %d\n"
 
-#: common/exechelp-posix.c:692 common/exechelp-posix.c:814
+#: common/exechelp-posix.c:701 common/exechelp-posix.c:823
 #, c-format
 msgid "error running '%s': terminated\n"
 msgstr "執行 '%s' 時出錯: 已終止\n"
 
-#: common/exechelp-posix.c:755 common/exechelp-w32.c:810
+#: common/exechelp-posix.c:764 common/exechelp-w32.c:813
 #, fuzzy, c-format
 #| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "等候 %d 處�程�終止時失敗: %s\n"
 
-#: common/exechelp-w32.c:822 common/exechelp-w32ce.c:775
+#: common/exechelp-w32.c:825 common/exechelp-w32ce.c:775
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "�得 %d 執行程���碼時出錯: %s\n"
@@ -1021,13 +1123,13 @@ msgstr "警告: %s 的所有權 \"%s\" 並�安全\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: %s 的權� \"%s\" 並�安全\n"
 
-#: common/sysutils.c:881
+#: common/sysutils.c:885
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "正在等候代�程�出� ... (%d 秒)\n"
 
-#: common/sysutils.c:907
+#: common/sysutils.c:911
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "把 '%s' �新新命� '%s' 時失敗: %s\n"
@@ -1087,22 +1189,22 @@ msgstr "在安全記憶體�置 %lu �元組時超出核心"
 msgid "out of core while allocating %lu bytes"
 msgstr "�置 %lu �元組時超出核心"
 
-#: common/miscellaneous.c:115 g10/card-util.c:902 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "�置足夠的記憶體時出錯: %s\n"
 
-#: common/miscellaneous.c:143
+#: common/miscellaneous.c:202
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: 廢棄的 \"%s\" �項 - 沒有任何影響\n"
 
-#: common/miscellaneous.c:146
+#: common/miscellaneous.c:205
 #, c-format
 msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgstr "警告: \"%s%s\" 是已廢棄的�項 - 沒有效果\n"
 
-#: common/miscellaneous.c:694
+#: common/miscellaneous.c:753
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr ""
@@ -1411,7 +1513,7 @@ msgstr "無效的�項"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "\"%.50s\" �項�失了引數\n"
 
-#: common/argparse.c:558 g10/gpg.c:3529
+#: common/argparse.c:558 g10/gpg.c:3523
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "�項 \"%.50s\" 的引數無效\n"
@@ -1441,17 +1543,17 @@ msgstr "\"%.50s\" 指令�明確\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "無效的�項 \"%.50s\"\n"
 
-#: common/argparse.c:1745 common/argparse.c:1840
+#: common/argparse.c:1756 common/argparse.c:1851
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "請注�: 沒有�設�項檔 '%s'\n"
 
-#: common/argparse.c:1832
+#: common/argparse.c:1843
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "�項檔 '%s': %s\n"
 
-#: common/argparse.c:2255
+#: common/argparse.c:2266
 #, c-format
 msgid "Note: ignoring option \"--%s\" due to global config\n"
 msgstr ""
@@ -1471,41 +1573,41 @@ msgstr "iconv_open 失敗: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "從 '%s' 轉�到 '%s' 失敗: %s\n"
 
-#: common/dotlock.c:724
+#: common/dotlock.c:728
 #, c-format
 msgid "failed to create temporary file '%s': %s\n"
 msgstr "建立暫存檔失敗 '%s': %s\n"
 
-#: common/dotlock.c:786
+#: common/dotlock.c:790
 #, c-format
 msgid "error writing to '%s': %s\n"
 msgstr "寫入 '%s' 時出錯: %s\n"
 
-#: common/dotlock.c:1137
+#: common/dotlock.c:1173
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "正在移除陳�的鎖定檔 (由 %d 所建立)\n"
 
-#: common/dotlock.c:1173
+#: common/dotlock.c:1210
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "正在等候鎖定 (被 %d%s �有) %s...\n"
 
-#: common/dotlock.c:1174
+#: common/dotlock.c:1211
 msgid "(deadlock?) "
 msgstr "(死�嗎?) "
 
-#: common/dotlock.c:1213
+#: common/dotlock.c:1250
 #, c-format
 msgid "lock '%s' not made: %s\n"
 msgstr "未鎖定 '%s': %s\n"
 
-#: common/dotlock.c:1240
+#: common/dotlock.c:1277
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "正在等候 `%s' 鎖定...\n"
 
-#: common/init.c:191 sm/gpgsm.c:867 dirmngr/dirmngr.c:937 dirmngr/dirmngr.c:946
+#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:980 dirmngr/dirmngr.c:989
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太舊了 (需� %s, 但是祇有 %s)\n"
@@ -1743,23 +1845,23 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/call-dirmngr.c:437 g10/gpg.c:4458
+#: g10/call-dirmngr.c:437 g10/gpg.c:4456
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "��: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1908
+#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有�用的 OpenPGP �片: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1914
+#: g10/card-util.c:91 g10/card-util.c:1924
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "�測到 OpenPGP �片編號 %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2243 g10/delkey.c:160 g10/keyedit.c:1423
+#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423
 #: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
@@ -1775,8 +1877,8 @@ msgstr "祇有第二版�片纔能用這個指令\n"
 msgid "Reset Code not or not anymore available\n"
 msgstr "(�也) 沒有�設碼\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704
+#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
 #: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477
 #: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
@@ -1786,120 +1888,120 @@ msgstr "你��哪一個? "
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:545
+#: g10/card-util.c:554
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:546
+#: g10/card-util.c:555
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "not forced"
 msgstr "�強迫使用"
 
-#: g10/card-util.c:573
+#: g10/card-util.c:582
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:750
+#: g10/card-util.c:759
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目�祇�許使用單純的 ASCII 字符.\n"
 
-#: g10/card-util.c:752
+#: g10/card-util.c:761
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: �能使用 \"<\" 字符.\n"
 
-#: g10/card-util.c:754
+#: g10/card-util.c:763
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並��許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:772
+#: g10/card-util.c:781
 msgid "Cardholder's surname: "
 msgstr "�片�有者的姓�: "
 
-#: g10/card-util.c:774
+#: g10/card-util.c:783
 msgid "Cardholder's given name: "
 msgstr "�片�有者的�字: "
 
-#: g10/card-util.c:793
+#: g10/card-util.c:802
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: �併後的�字太長 (上�是 %d 個字符).\n"
 
-#: g10/card-util.c:817
+#: g10/card-util.c:826
 msgid "URL to retrieve public key: "
 msgstr "�回公鑰的 URL: "
 
-#: g10/card-util.c:911 g10/decrypt-data.c:490 g10/import.c:399 g10/import.c:746
+#: g10/card-util.c:920 g10/decrypt-data.c:503 g10/import.c:399 g10/import.c:746
 #: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1747
-#: tools/gpgconf.c:482 tools/gpgconf.c:528
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1741
+#: tools/gpgconf.c:483 tools/gpgconf.c:529
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "讀� '%s' 時出錯: %s\n"
 
-#: g10/card-util.c:944 g10/decrypt-data.c:493 g10/export.c:2467
+#: g10/card-util.c:953 g10/decrypt-data.c:506 g10/export.c:2467
 #: dirmngr/crlcache.c:925
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "寫入 '%s' 時出錯: %s\n"
 
-#: g10/card-util.c:971
+#: g10/card-util.c:980
 msgid "Login data (account name): "
 msgstr "登入資料 (帳號�稱): "
 
-#: g10/card-util.c:1009
+#: g10/card-util.c:1018
 msgid "Private DO data: "
 msgstr "�人的 DO 資料: "
 
-#: g10/card-util.c:1094
+#: g10/card-util.c:1103
 msgid "Language preferences: "
 msgstr "介�語言�好設定: "
 
-#: g10/card-util.c:1102
+#: g10/card-util.c:1111
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 無效的�好設定字串長度\n"
 
-#: g10/card-util.c:1111
+#: g10/card-util.c:1120
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: �好設定字串中�有無效的字符\n"
 
-#: g10/card-util.c:1133
+#: g10/card-util.c:1142
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1147
+#: g10/card-util.c:1156
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:1169
+#: g10/card-util.c:1178
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:1192
+#: g10/card-util.c:1201
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 無效的格�化指紋.\n"
 
-#: g10/card-util.c:1242
+#: g10/card-util.c:1252
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "��能進行金鑰�作: %s\n"
 
-#: g10/card-util.c:1243
+#: g10/card-util.c:1253
 msgid "not an OpenPGP card"
 msgstr "這�是 OpenPGP �片"
 
-#: g10/card-util.c:1256 g10/keygen.c:4486 g10/keygen.c:5565
+#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�得�用金鑰資訊時出錯: %s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1351
 msgid "Replace existing key? (y/N) "
 msgstr "是���代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1909,108 +2011,108 @@ msgstr ""
 "      如果金鑰產生失敗了, 煩請查閱你�片上的文件,\n"
 "      看看這張�片支�哪些尺寸.\n"
 
-#: g10/card-util.c:1380 g10/keygen.c:2363 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "你想�用多大的金鑰尺寸? (%u) "
 
-#: g10/card-util.c:1390 g10/keygen.c:2286 g10/keygen.c:2318
+#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u �元\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2371 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定�介於 %u 到 %u 之間\n"
 
-#: g10/card-util.c:1417
+#: g10/card-util.c:1427
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1419
+#: g10/card-util.c:1429
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1421
+#: g10/card-util.c:1431
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1423
+#: g10/card-util.c:1433
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1926 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "請�擇你�使用的金鑰種類:\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1436 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1427
+#: g10/card-util.c:1437
 #, fuzzy, c-format
 #| msgid "   (%d) ECC and ECC\n"
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC 和 ECC\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
+#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816
 #: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987
 #: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "無效的�擇.\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1522
 #, 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:1517
+#: g10/card-util.c:1527
 #, 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:1553
+#: g10/card-util.c:1563
 #, 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:1569 g10/card-util.c:2096
+#: g10/card-util.c:1579 g10/card-util.c:2106
 #, 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:1575 g10/card-util.c:1920 g10/card-util.c:2102
+#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112
 #, 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:1621
+#: g10/card-util.c:1631
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是��為加密用金鑰建立�外備份? (Y/n) "
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1645
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "請注�: 金鑰已經存放在�片上了!\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1648
 msgid "Replace existing keys? (y/N) "
 msgstr "是���代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1660
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2021,175 +2123,175 @@ msgstr ""
 "   PIN = '%s'     管�者 PIN = '%s'\n"
 "你應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1695
 msgid "Please select the type of key to generate:\n"
 msgstr "請�擇你�產生的金鑰種類:\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1697 g10/card-util.c:1787
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1698 g10/card-util.c:1789
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1699 g10/card-util.c:1791
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1784
 msgid "Please select where to store the key:\n"
 msgstr "請�擇�把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1830
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD 失敗: %s\n"
 
-#: g10/card-util.c:1925
+#: g10/card-util.c:1935
 #, 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:1928
+#: g10/card-util.c:1938
 #, fuzzy
 #| msgid "Continue? (Y/n) "
 msgid "Continue? (y/N) "
 msgstr "是�繼續? (Y/n) "
 
-#: g10/card-util.c:1933
+#: g10/card-util.c:1943
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2119
+#: g10/card-util.c:2129
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "關閉 %s 時出錯: %s\n"
 
-#: g10/card-util.c:2148 g10/keyedit.c:1260
+#: g10/card-util.c:2158 g10/keyedit.c:1260
 msgid "quit this menu"
 msgstr "離開這個�單"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2160
 msgid "show admin commands"
 msgstr "顯示管�者指令"
 
-#: g10/card-util.c:2151 g10/keyedit.c:1263
+#: g10/card-util.c:2161 g10/keyedit.c:1263
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2163
 msgid "list all available data"
 msgstr "列出所有�用的資料"
 
-#: g10/card-util.c:2156
+#: g10/card-util.c:2166
 msgid "change card holder's name"
 msgstr "變更�片�有人的�字"
 
-#: g10/card-util.c:2157
+#: g10/card-util.c:2167
 msgid "change URL to retrieve key"
 msgstr "變更�回金鑰的 URL"
 
-#: g10/card-util.c:2158
+#: g10/card-util.c:2168
 msgid "fetch the key specified in the card URL"
 msgstr "從�片 URL �回指定的金鑰"
 
-#: g10/card-util.c:2159
+#: g10/card-util.c:2169
 msgid "change the login name"
 msgstr "變更登入�稱"
 
-#: g10/card-util.c:2160
+#: g10/card-util.c:2170
 msgid "change the language preferences"
 msgstr "變更介�語言�好設定"
 
-#: g10/card-util.c:2161
+#: g10/card-util.c:2171
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "變更�片�有者的性別"
 
-#: g10/card-util.c:2163
+#: g10/card-util.c:2173
 msgid "change a CA fingerprint"
 msgstr "變更�個憑證中心 (CA) 的指紋"
 
-#: g10/card-util.c:2164
+#: g10/card-util.c:2174
 msgid "toggle the signature force PIN flag"
 msgstr "切�簽章是�強制使用個人識別碼 (PIN) 的旗標"
 
-#: g10/card-util.c:2165
+#: g10/card-util.c:2175
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:2166
+#: g10/card-util.c:2176
 msgid "menu to change or unblock the PIN"
 msgstr "變更或�設個人識別碼 (PIN) 的�單"
 
-#: g10/card-util.c:2167
+#: g10/card-util.c:2177
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:2168
+#: g10/card-util.c:2178
 msgid "unblock the PIN using a Reset Code"
 msgstr "用�設碼來解�個人識別碼 (PIN)"
 
-#: g10/card-util.c:2169
+#: g10/card-util.c:2179
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2170
+#: g10/card-util.c:2180
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|�字|使用指定�字�為�證用的使用者�稱"
 
-#: g10/card-util.c:2171
+#: g10/card-util.c:2181
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "更改主觀信任"
 
-#: g10/card-util.c:2295
+#: g10/card-util.c:2305
 msgid "gpg/card> "
 msgstr "gpg/�片> "
 
-#: g10/card-util.c:2336
+#: g10/card-util.c:2346
 msgid "Admin-only command\n"
 msgstr "�管�者使用的指令\n"
 
-#: g10/card-util.c:2367
+#: g10/card-util.c:2377
 msgid "Admin commands are allowed\n"
 msgstr "�許使用管�者指令\n"
 
-#: g10/card-util.c:2369
+#: g10/card-util.c:2379
 msgid "Admin commands are not allowed\n"
 msgstr "未�許使用管�者指令\n"
 
-#: g10/card-util.c:2472 g10/keyedit.c:2229
+#: g10/card-util.c:2482 g10/keyedit.c:2229
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1002
+#: g10/decrypt.c:191 g10/encrypt.c:1014
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5153 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "無法開啟 '%s'\n"
 
 #: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
-#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335
-#: g10/keyedit.c:2581 g10/keyedit.c:4544 g10/keylist.c:693 g10/keyserver.c:1092
+#: g10/getkey.c:2108 g10/gpg.c:5098 g10/keyedit.c:1445 g10/keyedit.c:2335
+#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092
 #: g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "找�到金鑰 \"%s\": %s\n"
 
 #: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517
-#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
+#: g10/gpg.c:5107 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2249,8 +2351,8 @@ msgid "subkey"
 msgstr "�鑰"
 
 #: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388
-#: g10/keyedit.c:2462 g10/keyedit.c:2533 g10/keyedit.c:2758 g10/keyedit.c:2988
-#: g10/keyedit.c:3057 g10/keyedit.c:3208
+#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044
+#: g10/keyedit.c:3113 g10/keyedit.c:3264
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
@@ -2290,25 +2392,25 @@ msgstr "因處於 S2K 模�下而無法使用�稱� ESK �包\n"
 msgid "using cipher %s\n"
 msgstr "正在使用 %s 編密法\n"
 
-#: g10/encrypt.c:233 g10/encrypt.c:668
+#: g10/encrypt.c:233 g10/encrypt.c:680
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' 已經被壓縮了\n"
 
-#: g10/encrypt.c:290 g10/encrypt.c:704 g10/sign.c:760
+#: g10/encrypt.c:290 g10/encrypt.c:716 g10/sign.c:760
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "警告: '%s' 是個空檔案\n"
 
-#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:260 g10/gpg.c:3959
-#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1562
+#: g10/encrypt.c:387 g10/encrypt.c:610 g10/decrypt-data.c:266 g10/gpg.c:3957
+#: g10/gpg.c:3997 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "你�該將 '%s' 編密演算法用於 %s 模�\n"
 
-#: g10/encrypt.c:396 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175
-#: g10/sign.c:391 sm/gpgsm.c:1572 sm/gpgsm.c:1582 sm/sign.c:478 sm/verify.c:506
+#: g10/encrypt.c:396 g10/gpg.c:3963 g10/gpg.c:4009 g10/sig-check.c:175
+#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506
 #, fuzzy, c-format
 #| msgid "you may not use digest algorithm '%s' while in %s mode\n"
 msgid "digest algorithm '%s' may not be used in %s mode\n"
@@ -2331,46 +2433,52 @@ msgstr "警告: 強迫使用 %s (%d) å°�稱å¼�編密法會é�•å��收件者å��好è
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "警告: \"%s%s\" 是已廢棄的�項 - 沒有效果\n"
 
-#: g10/encrypt.c:751 g10/sign.c:1162
+#: g10/encrypt.c:662 g10/mainproc.c:947 g10/mainproc.c:2628 sm/decrypt.c:1035
+#: sm/encrypt.c:541 sm/verify.c:522
+#, c-format
+msgid "operation forced to fail due to unfulfilled compliance rules\n"
+msgstr ""
+
+#: g10/encrypt.c:763 g10/sign.c:1162
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會��收件者�好設定\n"
 
-#: g10/encrypt.c:861
+#: g10/encrypt.c:873
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) �稱�編密法會��收件者�好設定\n"
 
-#: g10/encrypt.c:949
+#: g10/encrypt.c:961
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已加密給: \"%s\"\n"
 
-#: g10/encrypt.c:977 g10/pkclist.c:1028 g10/pkclist.c:1079
+#: g10/encrypt.c:989 g10/pkclist.c:1028 g10/pkclist.c:1079
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "你�能夠將 %s 用於 %s 模�中\n"
 
-#: g10/decrypt-data.c:240 g10/mainproc.c:391
+#: g10/decrypt-data.c:246 g10/mainproc.c:410
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 已加密的資料\n"
 
-#: g10/decrypt-data.c:243 g10/mainproc.c:397
+#: g10/decrypt-data.c:249 g10/mainproc.c:416
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以 %d 未知演算法所加密\n"
 
-#: g10/decrypt-data.c:357 g10/decrypt-data.c:410 sm/decrypt.c:550
+#: g10/decrypt-data.c:369 g10/decrypt-data.c:422 sm/decrypt.c:550
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告: 訊�已用�稱�編密法的弱金鑰加密了.\n"
 
-#: g10/decrypt-data.c:369 g10/decrypt-data.c:422
+#: g10/decrypt-data.c:381 g10/decrypt-data.c:434
 #, c-format
 msgid "problem handling encrypted packet\n"
 msgstr "處�已加密�包有�題\n"
@@ -2552,221 +2660,279 @@ msgstr "無效的金鑰 %s �以藉由 --allow-non-selfsigned-uid 而生效\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用�鑰 %s 來替�主鑰 %s\n"
 
-#: g10/getkey.c:4446 g10/gpg.c:2132
+#: g10/getkey.c:4446 g10/gpg.c:2135
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "�項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:442 sm/gpgsm.c:208
+#: g10/gpg.c:443 sm/gpgsm.c:212
 msgid "make a signature"
 msgstr "建立簽章"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:444
 msgid "make a clear text signature"
 msgstr "建立明文簽章"
 
-#: g10/gpg.c:445 sm/gpgsm.c:210
+#: g10/gpg.c:446 sm/gpgsm.c:214
 msgid "make a detached signature"
 msgstr "建立分離�簽章"
 
-#: g10/gpg.c:446 sm/gpgsm.c:211
+#: g10/gpg.c:447 sm/gpgsm.c:215
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:449
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用�稱�編密法來加密"
 
-#: g10/gpg.c:450 sm/gpgsm.c:213
+#: g10/gpg.c:451 sm/gpgsm.c:217
 msgid "decrypt data (default)"
 msgstr "資料解密 (�設)"
 
-#: g10/gpg.c:452 sm/gpgsm.c:214
+#: g10/gpg.c:453 sm/gpgsm.c:218
 msgid "verify a signature"
 msgstr "驗證簽章"
 
-#: g10/gpg.c:454 sm/gpgsm.c:215
+#: g10/gpg.c:455 sm/gpgsm.c:219
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:460
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:461 sm/gpgsm.c:220
+#: g10/gpg.c:462 sm/gpgsm.c:224
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:462 sm/gpgsm.c:218
+#: g10/gpg.c:463 sm/gpgsm.c:222
 msgid "list secret keys"
 msgstr "列出�鑰"
 
-#: g10/gpg.c:464 sm/gpgsm.c:221
+#: g10/gpg.c:465 sm/gpgsm.c:225
 msgid "generate a new key pair"
 msgstr "產生新的金鑰�"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:468
 msgid "quickly generate a new key pair"
 msgstr "快速產生新的金鑰�"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:471
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "快速產生新的金鑰�"
 
-#: g10/gpg.c:475
+#: g10/gpg.c:476
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "快速產生新的金鑰�"
 
-#: g10/gpg.c:478
+#: g10/gpg.c:479
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "快速產生新的金鑰�"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:482
 msgid "full featured key pair generation"
 msgstr "全能金鑰�生�"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:485
 msgid "generate a revocation certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/gpg.c:487 sm/gpgsm.c:224
+#: g10/gpg.c:488 sm/gpgsm.c:228
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:489
+#: g10/gpg.c:490
 msgid "remove keys from the secret keyring"
 msgstr "從�鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly sign a key"
 msgstr "快速簽署金鑰"
 
-#: g10/gpg.c:493
+#: g10/gpg.c:494
 msgid "quickly sign a key locally"
 msgstr "快速在本機簽署金鑰"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "快速產生新的金鑰�"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:497
 msgid "sign a key"
 msgstr "簽署金鑰"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "sign a key locally"
 msgstr "僅在本機簽署金鑰"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "sign or edit a key"
 msgstr "簽署或編輯金鑰"
 
-#: g10/gpg.c:500 sm/gpgsm.c:242
+#: g10/gpg.c:501 sm/gpgsm.c:246
 msgid "change a passphrase"
 msgstr "更改密語"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "export keys to a keyserver"
 msgstr "把金鑰匯出至金鑰伺�器"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "import keys from a keyserver"
 msgstr "從金鑰伺�器匯入金鑰"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "search for keys on a keyserver"
 msgstr "在金鑰伺�器上�尋金鑰"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "update all keys from a keyserver"
 msgstr "從金鑰伺�器更新所有的金鑰"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import/merge keys"
 msgstr "匯入/�併金鑰"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "print the card status"
 msgstr "列��片狀態"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "change data on a card"
 msgstr "變更�片上的資料"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "change a card's PIN"
 msgstr "變更�片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:546
+#: g10/gpg.c:548
 msgid "print message digests"
 msgstr "�出訊�摘�"
 
-#: g10/gpg.c:549 sm/gpgsm.c:237
+#: g10/gpg.c:552 sm/gpgsm.c:241
 msgid "run in server mode"
 msgstr "以伺�器模�執行"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:554
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:555 sm/gpgsm.c:256
+#: g10/gpg.c:594
+msgid "|NAME|use NAME as default secret key"
+msgstr "|�字|使用指定�字�為�設�鑰"
+
+#: g10/gpg.c:596 sm/gpgsm.c:332
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|�字|也加密給指定�字的使用者 ID"
+
+#: g10/gpg.c:604
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|設定電�郵件別�"
+
+#: g10/gpg.c:616
+msgid "use strict OpenPGP behavior"
+msgstr "使用嚴謹的 OpenPGP 行為"
+
+#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112
+msgid "do not make any changes"
+msgstr "���任何改變"
+
+#: g10/gpg.c:642
+msgid "prompt before overwriting"
+msgstr "覆寫�先詢�"
+
+#: g10/gpg.c:689 sm/gpgsm.c:304
+#, fuzzy
+#| msgid "Options controlling the security"
+msgid "Options controlling the input"
+msgstr "控制著安全性的�項"
+
+#: g10/gpg.c:707 sm/gpgsm.c:314
+#, fuzzy
+#| msgid "Options controlling the diagnostic output"
+msgid "Options controlling the output"
+msgstr "控制著診斷性輸出的�項"
+
+#: g10/gpg.c:709 sm/gpgsm.c:316
 msgid "create ascii armored output"
 msgstr "建立以 ASCII ���的輸出"
 
-#: g10/gpg.c:558 sm/gpgsm.c:273
-msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|使用者-ID|以指定使用者 ID 作為加密�象"
+#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321
+msgid "|FILE|write output to FILE"
+msgstr "|檔案|將輸出寫入至指定檔案"
 
-#: g10/gpg.c:574 sm/gpgsm.c:309
-msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
+#: g10/gpg.c:726
+msgid "use canonical text mode"
+msgstr "使用標準的文字模�"
 
-#: g10/gpg.c:580
+#: g10/gpg.c:743
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示�壓縮)"
 
-#: g10/gpg.c:587
-msgid "use canonical text mode"
-msgstr "使用標準的文字模�"
+#: g10/gpg.c:750 sm/gpgsm.c:347
+#, fuzzy
+#| msgid "Options controlling the interactivity and enforcement"
+msgid "Options controlling key import and export"
+msgstr "控制著互動�強制執行的�項"
 
-#: g10/gpg.c:604 g10/gpgv.c:82 sm/gpgsm.c:311
-msgid "|FILE|write output to FILE"
-msgstr "|檔案|將輸出寫入至指定檔案"
+#: g10/gpg.c:753
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地�找出金鑰"
 
-#: g10/gpg.c:614 kbx/kbxutil.c:90 sm/gpgsm.c:323 tools/gpgconf.c:111
-msgid "do not make any changes"
-msgstr "���任何改變"
+#: g10/gpg.c:762 sm/gpgsm.c:350
+msgid "disable all access to the dirmngr"
+msgstr "�用所有的 dirmngr 存�"
 
-#: g10/gpg.c:615
-msgid "prompt before overwriting"
-msgstr "覆寫�先詢�"
+#: g10/gpg.c:774 sm/gpgsm.c:357
+#, fuzzy
+#| msgid "Options controlling the configuration"
+msgid "Options controlling key listings"
+msgstr "控制著組態的�項"
 
-#: g10/gpg.c:665
-msgid "use strict OpenPGP behavior"
-msgstr "使用嚴謹的 OpenPGP 行為"
+#: g10/gpg.c:803 sm/gpgsm.c:324
+#, fuzzy
+#| msgid "list secret keys"
+msgid "Options to specify keys"
+msgstr "列出�鑰"
 
-#: g10/gpg.c:694 sm/gpgsm.c:368
+#: g10/gpg.c:805 sm/gpgsm.c:326
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|使用者-ID|以指定使用者 ID 作為加密�象"
+
+#: g10/gpg.c:813 sm/gpgsm.c:328
+msgid "|USER-ID|use USER-ID to sign or decrypt"
+msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
+
+#: g10/gpg.c:864 sm/gpgsm.c:396
+msgid "Options for unattended use"
+msgstr ""
+
+#: g10/gpg.c:883 sm/gpgsm.c:408 dirmngr/dirmngr.c:293
+msgid "Other options"
+msgstr ""
+
+#: g10/gpg.c:951 sm/gpgsm.c:440
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2774,7 +2940,7 @@ msgstr ""
 "@\n"
 "(請�照線上說明��來�得所有命令和�項的完整清單)\n"
 
-#: g10/gpg.c:697
+#: g10/gpg.c:954
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2804,11 +2970,11 @@ msgstr ""
 " --list-keys [�字]         顯示金鑰\n"
 " --fingerprint [�字]       顯示指紋\n"
 
-#: g10/gpg.c:1108
+#: g10/gpg.c:1128
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "用法: @GPG@ [�項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:1111
+#: g10/gpg.c:1131
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2818,7 +2984,7 @@ msgstr ""
 "簽署, 檢查, 加密, 解密\n"
 "�設的�作會�輸入資料而定\n"
 
-#: g10/gpg.c:1122 sm/gpgsm.c:598
+#: g10/gpg.c:1142 sm/gpgsm.c:624
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2826,546 +2992,546 @@ msgstr ""
 "\n"
 "已支�的演算法:\n"
 
-#: g10/gpg.c:1125
+#: g10/gpg.c:1145
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:1132 g10/keyedit.c:3282
+#: g10/gpg.c:1152 g10/keyedit.c:3338
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:1139
+#: g10/gpg.c:1159
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:1146 g10/keyedit.c:3348
+#: g10/gpg.c:1166 g10/keyedit.c:3404
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:1219 sm/gpgsm.c:672
+#: g10/gpg.c:1239 sm/gpgsm.c:698
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "用法: %s [�項] %s\n"
 
-#: g10/gpg.c:1408 sm/gpgsm.c:765
+#: g10/gpg.c:1434 sm/gpgsm.c:791
 #, c-format
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1426
+#: g10/gpg.c:1452
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "在群組定義 '%s' 裡找�到 = 記號\n"
 
-#: g10/gpg.c:1624
+#: g10/gpg.c:1650
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的所有權並�安全\n"
 
-#: g10/gpg.c:1627
+#: g10/gpg.c:1653
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的所有權並�安全\n"
 
-#: g10/gpg.c:1630
+#: g10/gpg.c:1656
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的所有權並�安全\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1662
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的權�並�安全\n"
 
-#: g10/gpg.c:1639
+#: g10/gpg.c:1665
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的權�並�安全\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1668
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的權�並�安全\n"
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1674
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的�入目錄所有權並�安全\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1677
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的�入目錄所有權並�安全\n"
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1680
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的�入目錄所有權並�安全\n"
 
-#: g10/gpg.c:1660
+#: g10/gpg.c:1686
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的�入目錄權�並�安全\n"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1689
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的�入目錄權�並�安全\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1692
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的�入目錄權�並�安全\n"
 
-#: g10/gpg.c:1882
+#: g10/gpg.c:1908
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的組態項目 '%s'\n"
 
-#: g10/gpg.c:2004
+#: g10/gpg.c:2007
 msgid "display photo IDs during key listings"
 msgstr "列出金鑰時顯示照片 ID"
 
-#: g10/gpg.c:2006
+#: g10/gpg.c:2009
 msgid "show key usage information during key listings"
 msgstr "列出金鑰時顯示金鑰用途資訊"
 
-#: g10/gpg.c:2008
+#: g10/gpg.c:2011
 msgid "show policy URLs during signature listings"
 msgstr "列出簽章時顯示原則 URL"
 
-#: g10/gpg.c:2010
+#: g10/gpg.c:2013
 msgid "show all notations during signature listings"
 msgstr "列出簽章時顯示所有的註記"
 
-#: g10/gpg.c:2012
+#: g10/gpg.c:2015
 msgid "show IETF standard notations during signature listings"
 msgstr "列出簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:2016
+#: g10/gpg.c:2019
 msgid "show user-supplied notations during signature listings"
 msgstr "列出簽章時顯示使用者�供的註記"
 
-#: g10/gpg.c:2018
+#: g10/gpg.c:2021
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出簽章時顯示�好的金鑰伺�器 URL"
 
-#: g10/gpg.c:2020
+#: g10/gpg.c:2023
 msgid "show user ID validity during key listings"
 msgstr "列出金鑰時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:2022
+#: g10/gpg.c:2025
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出金鑰時顯示已撤銷或�期的使用者 ID"
 
-#: g10/gpg.c:2024
+#: g10/gpg.c:2027
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出金鑰時顯示已撤銷或�期的�鑰"
 
-#: g10/gpg.c:2026
+#: g10/gpg.c:2029
 msgid "show the keyring name in key listings"
 msgstr "在金鑰清單中顯示鑰匙圈�稱"
 
-#: g10/gpg.c:2028
+#: g10/gpg.c:2031
 msgid "show expiration dates during signature listings"
 msgstr "列出簽章時顯示有效期�"
 
-#: g10/gpg.c:2143
+#: g10/gpg.c:2146
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的�項 '%s'\n"
 
-#: g10/gpg.c:2145
+#: g10/gpg.c:2148
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2235 g10/keyedit.c:1719
+#: g10/gpg.c:2238 g10/keyedit.c:1719
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模�中��許使用這個指令.\n"
 
-#: g10/gpg.c:2873 g10/gpg.c:3718 g10/gpg.c:3730
+#: g10/gpg.c:2876 g10/gpg.c:3716 g10/gpg.c:3728
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "請注�: 一般情�下�採用 %s!\n"
 
-#: g10/gpg.c:3052 g10/gpg.c:3064
+#: g10/gpg.c:3051 g10/gpg.c:3063
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' �是有效的簽章使用期�\n"
 
-#: g10/gpg.c:3086
+#: g10/gpg.c:3085
 #, 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:3118 sm/gpgsm.c:1095
+#: g10/gpg.c:3117 sm/gpgsm.c:1121
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "無效的個人識別碼項目模� '%s'\n"
 
-#: g10/gpg.c:3124 sm/gpgsm.c:1101
+#: g10/gpg.c:3123 sm/gpgsm.c:1127
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "invalid request origin '%s'\n"
 msgstr "�項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:3178
+#: g10/gpg.c:3177
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' �是有效的字元集\n"
 
-#: g10/gpg.c:3200 g10/gpg.c:3414 g10/keyedit.c:5282
+#: g10/gpg.c:3199 g10/gpg.c:3413 g10/keyedit.c:5338
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖�金鑰伺�器 URL\n"
 
-#: g10/gpg.c:3218
+#: g10/gpg.c:3217
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺�器�項\n"
 
-#: g10/gpg.c:3221
+#: g10/gpg.c:3220
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺�器�項\n"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3227
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入�項\n"
 
-#: g10/gpg.c:3231
+#: g10/gpg.c:3230
 #, c-format
 msgid "invalid import options\n"
 msgstr "無效的匯入�項\n"
 
-#: g10/gpg.c:3237 g10/gpg.c:3252
+#: g10/gpg.c:3236 g10/gpg.c:3251
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "無效的清單�項\n"
 
-#: g10/gpg.c:3243
+#: g10/gpg.c:3242
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出�項\n"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3245
 #, c-format
 msgid "invalid export options\n"
 msgstr "無效的匯出�項\n"
 
-#: g10/gpg.c:3258
+#: g10/gpg.c:3257
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單�項\n"
 
-#: g10/gpg.c:3261
+#: g10/gpg.c:3260
 #, c-format
 msgid "invalid list options\n"
 msgstr "無效的清單�項\n"
 
-#: g10/gpg.c:3269
+#: g10/gpg.c:3268
 msgid "display photo IDs during signature verification"
 msgstr "驗證簽章時顯示照片 ID"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3270
 msgid "show policy URLs during signature verification"
 msgstr "驗證簽章時顯示原則 URL"
 
-#: g10/gpg.c:3273
+#: g10/gpg.c:3272
 msgid "show all notations during signature verification"
 msgstr "驗證簽章時顯示所有的註記"
 
-#: g10/gpg.c:3275
+#: g10/gpg.c:3274
 msgid "show IETF standard notations during signature verification"
 msgstr "驗證簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3278
 msgid "show user-supplied notations during signature verification"
 msgstr "驗證簽章時顯示使用者�供的註記"
 
-#: g10/gpg.c:3281
+#: g10/gpg.c:3280
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "驗證簽章時顯示�好的金鑰伺�器 URL"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3282
 msgid "show user ID validity during signature verification"
 msgstr "驗證簽章時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:3285
+#: g10/gpg.c:3284
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "驗證簽章時顯示已撤銷或�期的使用者 ID"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3286
 msgid "show only the primary user ID in signature verification"
 msgstr "驗證簽章時祇顯示主�的使用者 ID"
 
-#: g10/gpg.c:3289
+#: g10/gpg.c:3288
 msgid "validate signatures with PKA data"
 msgstr "以 PKA 資料驗證簽章"
 
-#: g10/gpg.c:3291
+#: g10/gpg.c:3290
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "�高��有有效 PKA 資料之簽章的信任"
 
-#: g10/gpg.c:3298
+#: g10/gpg.c:3297
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證�項\n"
 
-#: g10/gpg.c:3301
+#: g10/gpg.c:3300
 #, c-format
 msgid "invalid verify options\n"
 msgstr "無效的驗證�項\n"
 
-#: g10/gpg.c:3308
+#: g10/gpg.c:3307
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設� %s\n"
 
-#: g10/gpg.c:3517
+#: g10/gpg.c:3511
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的自動金鑰定�清單\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3514
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定�清單\n"
 
-#: g10/gpg.c:3700 sm/gpgsm.c:1447
+#: g10/gpg.c:3698 sm/gpgsm.c:1492
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程��能會傾�出核心檔!\n"
 
-#: g10/gpg.c:3711
+#: g10/gpg.c:3709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ��許跟 %s 併用!\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有�義!\n"
 
-#: g10/gpg.c:3738 sm/gpgsm.c:1464 dirmngr/dirmngr.c:1155
+#: g10/gpg.c:3736 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1198
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告: 正在�造的系統時間中執行: "
 
-#: g10/gpg.c:3759
+#: g10/gpg.c:3757
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而�會在�安全的記憶體中執行\n"
 
-#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1532
+#: g10/gpg.c:3802 g10/gpg.c:3826 sm/gpgsm.c:1579
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所�的編密演算法無效\n"
 
-#: g10/gpg.c:3816
+#: g10/gpg.c:3814
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所�的壓縮演算法無效\n"
 
-#: g10/gpg.c:3822
+#: g10/gpg.c:3820
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所�的憑證摘�演算法無效\n"
 
-#: g10/gpg.c:3837
+#: g10/gpg.c:3835
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定�大於 0\n"
 
-#: g10/gpg.c:3839
+#: g10/gpg.c:3837
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定�大於 1\n"
 
-#: g10/gpg.c:3841
+#: g10/gpg.c:3839
 #, 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:3843
+#: g10/gpg.c:3841
 #, 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:3845
+#: g10/gpg.c:3843
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定�是 1, 2 或 3\n"
 
-#: g10/gpg.c:3849
+#: g10/gpg.c:3847
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注�: 強烈�建議使用單純 S2K 模� (0)\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3851
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模�; 一定�是 0, 1 或 3\n"
 
-#: g10/gpg.c:3860
+#: g10/gpg.c:3858
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "無效的�設�好\n"
 
-#: g10/gpg.c:3864
+#: g10/gpg.c:3862
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法�好\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3866
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘��好\n"
 
-#: g10/gpg.c:3872
+#: g10/gpg.c:3870
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮�好\n"
 
-#: g10/gpg.c:3908
+#: g10/gpg.c:3906
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起�作\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3969
 #, 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:4115
+#: g10/gpg.c:4113
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:4127
+#: g10/gpg.c:4125
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:4199
+#: g10/gpg.c:4197
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s' �稱�加密失敗: %s\n"
 
-#: g10/gpg.c:4228
+#: g10/gpg.c:4226
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "你�能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:4231
+#: g10/gpg.c:4229
 #, 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:4289
+#: g10/gpg.c:4287
 #, 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:4292
+#: g10/gpg.c:4290
 #, 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:4692 g10/keyserver.c:1648
+#: g10/gpg.c:4690 g10/keyserver.c:1648
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�至金鑰伺�器失敗: %s\n"
 
-#: g10/gpg.c:4697
+#: g10/gpg.c:4695
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺�器接收失敗: %s\n"
 
-#: g10/gpg.c:4703
+#: g10/gpg.c:4701
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:4716
+#: g10/gpg.c:4714
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:4728
+#: g10/gpg.c:4726
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺�器�尋失敗: %s\n"
 
-#: g10/gpg.c:4741
+#: g10/gpg.c:4739
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺�器更新失敗: %s\n"
 
-#: g10/gpg.c:4810
+#: g10/gpg.c:4808
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開��失敗: %s\n"
 
-#: g10/gpg.c:4821
+#: g10/gpg.c:4819
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行��失敗: %s\n"
 
-#: g10/gpg.c:4913
+#: g10/gpg.c:4911
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無效的雜湊演算法 '%s'\n"
 
-#: g10/gpg.c:5065 g10/tofu.c:2153
+#: g10/gpg.c:5063 g10/tofu.c:2153
 #, fuzzy, c-format
 #| msgid "error loading certificate '%s': %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "載入憑證 '%s' 時出錯: %s\n"
 
-#: g10/gpg.c:5078
+#: g10/gpg.c:5076
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5134
+#: g10/gpg.c:5132
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5145
+#: g10/gpg.c:5143
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始輸入你的訊� ...\n"
 
-#: g10/gpg.c:5490
+#: g10/gpg.c:5488
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:5492
+#: g10/gpg.c:5490
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:5525
+#: g10/gpg.c:5523
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的�好金鑰伺�器 URL 無效\n"
@@ -3378,7 +3544,7 @@ msgstr "|檔案|從指定鑰匙圈檔案裡�用金鑰"
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳�矛盾視為警告"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:358 tools/gpgconf.c:113
+#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114
 msgid "|FD|write status info to this FD"
 msgstr "|檔案�述|把狀態資訊寫入此指定檔案�述"
 
@@ -4086,7 +4252,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "你�然想�簽署它嗎? (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1661 g10/keyedit.c:2668
+#: g10/keyedit.c:1661 g10/keyedit.c:2724
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
@@ -4258,8 +4424,8 @@ msgstr "我�常�心地檢查�這把金鑰了.\n"
 msgid "Really sign? (y/N) "
 msgstr "真的�簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1031 g10/keyedit.c:6155 g10/keyedit.c:6238 g10/keyedit.c:6367
-#: g10/keyedit.c:6429 g10/sign.c:466
+#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423
+#: g10/keyedit.c:6485 g10/sign.c:466
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗: %s\n"
@@ -4452,7 +4618,7 @@ msgstr ""
 "  加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是��撤銷簽章\n"
 "  (nrsign), 當然也�以任�組�這些�項 (�是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1649 g10/keyedit.c:2668 g10/keyedit.c:3041 g10/keyedit.c:3109
+#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165
 msgid "Key is revoked."
 msgstr "金鑰已撤銷."
 
@@ -4502,7 +4668,7 @@ msgstr "真的�移除這個使用者 ID 嗎? (y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "真的�移動主鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1819 g10/keyedit.c:4804
+#: g10/keyedit.c:1819 g10/keyedit.c:4860
 msgid "You must select exactly one key.\n"
 msgstr "你一定祇得�擇一把金鑰.\n"
 
@@ -4576,171 +4742,171 @@ msgstr "�儲存變更嗎? (y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "��儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2217 g10/keyedit.c:2763 g10/keyedit.c:3062 g10/keyedit.c:3215
+#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以�需�更新.\n"
 
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2506
 #, 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:2476
+#: g10/keyedit.c:2532
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2598
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: g10/keyedit.c:2573
+#: g10/keyedit.c:2629
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" �是指紋\n"
 
-#: g10/keyedit.c:2603
+#: g10/keyedit.c:2659
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" �是主�指紋\n"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2742
+#: g10/keyedit.c:2795 g10/keyedit.c:2798
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "無效的數值\n"
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "No matching user IDs."
 msgstr "沒有相符的使用者 ID."
 
-#: g10/keyedit.c:2745
+#: g10/keyedit.c:2801
 msgid "Nothing to sign.\n"
 msgstr "沒有�西�以簽署.\n"
 
-#: g10/keyedit.c:2938 g10/keyedit.c:6020
+#: g10/keyedit.c:2994 g10/keyedit.c:6076
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "並�由你所簽署.\n"
 
-#: g10/keyedit.c:2996
+#: g10/keyedit.c:3052
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "檢查已建立的簽章時出錯: %s\n"
 
-#: g10/keyedit.c:3117
+#: g10/keyedit.c:3173
 #, fuzzy, c-format
 #| msgid "'%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' �是有效的簽章使用期�\n"
 
-#: g10/keyedit.c:3160
+#: g10/keyedit.c:3216
 #, fuzzy, c-format
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" �是指紋\n"
 
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3240
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "找�到金鑰 \"%s\": %s\n"
 
-#: g10/keyedit.c:3307
+#: g10/keyedit.c:3363
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3324
+#: g10/keyedit.c:3380
 msgid "Digest: "
 msgstr "摘�: "
 
-#: g10/keyedit.c:3381
+#: g10/keyedit.c:3437
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:3398
+#: g10/keyedit.c:3454
 msgid "Keyserver no-modify"
 msgstr "金鑰伺�器無修改"
 
-#: g10/keyedit.c:3413 g10/keylist.c:376
+#: g10/keyedit.c:3469 g10/keylist.c:376
 msgid "Preferred keyserver: "
 msgstr "�好的金鑰伺�器: "
 
-#: g10/keyedit.c:3421 g10/keyedit.c:3422
+#: g10/keyedit.c:3477 g10/keyedit.c:3478
 msgid "Notations: "
 msgstr "註記: "
 
-#: g10/keyedit.c:3670
+#: g10/keyedit.c:3726
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有�好設定.\n"
 
-#: g10/keyedit.c:3742
+#: g10/keyedit.c:3798
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
 
-#: g10/keyedit.c:3766
+#: g10/keyedit.c:3822
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰�能被 %s 金鑰 %s 所撤銷"
 
-#: g10/keyedit.c:3772
+#: g10/keyedit.c:3828
 msgid "(sensitive)"
 msgstr "(機密)"
 
-#: g10/keyedit.c:3814 g10/keyedit.c:3961 g10/keylist.c:264 g10/keyserver.c:361
+#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361
 #, c-format
 msgid "created: %s"
 msgstr "建立: %s"
 
-#: g10/keyedit.c:3817 g10/keylist.c:2153
+#: g10/keyedit.c:3873 g10/keylist.c:2153
 #, c-format
 msgid "revoked: %s"
 msgstr "撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:3819 g10/keylist.c:2159
+#: g10/keyedit.c:3875 g10/keylist.c:2159
 #, c-format
 msgid "expired: %s"
 msgstr "�期: %s"
 
 #  of subkey
-#: g10/keyedit.c:3821 g10/keyedit.c:3963 g10/keylist.c:266 g10/keylist.c:2165
+#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165
 #: g10/keyserver.c:367
 #, c-format
 msgid "expires: %s"
 msgstr "到期: %s"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3879
 #, c-format
 msgid "usage: %s"
 msgstr "用途: %s"
 
-#: g10/keyedit.c:3831 g10/keyedit.c:3851 g10/keylist.c:269
+#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269
 msgid "card-no: "
 msgstr "�片編號: "
 
-#: g10/keyedit.c:3890
+#: g10/keyedit.c:3946
 #, c-format
 msgid "trust: %s"
 msgstr "ä¿¡ä»»: %s"
 
-#: g10/keyedit.c:3894
+#: g10/keyedit.c:3950
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:3901
+#: g10/keyedit.c:3957
 msgid "This key has been disabled"
 msgstr "這把金鑰已經�用了"
 
-#: g10/keyedit.c:3919
+#: g10/keyedit.c:3975
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4748,17 +4914,17 @@ msgstr ""
 "請注�顯示出來的金鑰有效性�需�更正,\n"
 "除�你�新執行程�.\n"
 
-#: g10/keyedit.c:3980 g10/keyedit.c:4411 g10/keyserver.c:371
-#: g10/mainproc.c:2380 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371
+#: g10/mainproc.c:2470 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:3982 g10/keyedit.c:4413 g10/keyserver.c:375
-#: g10/mainproc.c:2382 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375
+#: g10/mainproc.c:2472 g10/tofu.c:1792 g10/trust.c:113
 msgid "expired"
 msgstr "已�期"
 
-#: g10/keyedit.c:4099
+#: g10/keyedit.c:4155
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4767,17 +4933,17 @@ msgstr ""
 "警告: 沒有任何使用者 ID 被標示為主� ID. 這項指令�能會\n"
 "      導致��的使用者 ID 被當�主� ID.\n"
 
-#: g10/keyedit.c:4151
+#: g10/keyedit.c:4207
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "警告: 你的加密�鑰很快將到期.\n"
 
-#: g10/keyedit.c:4152
+#: g10/keyedit.c:4208
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "你�能也會想變更其使用期�.\n"
 
-#: g10/keyedit.c:4211
+#: g10/keyedit.c:4267
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4786,72 +4952,72 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID �能會導致�些版本的 PGP �回這把金鑰.\n"
 
-#: g10/keyedit.c:4216 g10/keyedit.c:4506
+#: g10/keyedit.c:4272 g10/keyedit.c:4562
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "你確定�然想�增加嗎? (y/N) "
 
-#: g10/keyedit.c:4222
+#: g10/keyedit.c:4278
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "你��以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:4237 g10/keygen.c:2899
+#: g10/keyedit.c:4293 g10/keygen.c:2899
 msgid "Such a user ID already exists on this key!\n"
 msgstr "這把金鑰上已經有這樣�的使用者 ID 了!\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4395
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4349
+#: g10/keyedit.c:4405
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4353
+#: g10/keyedit.c:4409
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4360
+#: g10/keyedit.c:4416
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的�刪除這份自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:4376
+#: g10/keyedit.c:4432
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "已經刪除了 %d 份簽章.\n"
 
-#: g10/keyedit.c:4380
+#: g10/keyedit.c:4436
 msgid "Nothing deleted.\n"
 msgstr "沒有刪除任何�西.\n"
 
-#: g10/keyedit.c:4415
+#: g10/keyedit.c:4471
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:4417
+#: g10/keyedit.c:4473
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4479
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/keyedit.c:4431
+#: g10/keyedit.c:4487
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經最�化了\n"
 
-#: g10/keyedit.c:4432
+#: g10/keyedit.c:4488
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 
-#: g10/keyedit.c:4501
+#: g10/keyedit.c:4557
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4860,15 +5026,15 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者�能會導致�些版本的 PGP �回這把金鑰.\n"
 
-#: g10/keyedit.c:4512
+#: g10/keyedit.c:4568
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "你��以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:4529
+#: g10/keyedit.c:4585
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:4555
+#: g10/keyedit.c:4611
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
@@ -4876,26 +5042,26 @@ msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:4570
+#: g10/keyedit.c:4626
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "你�能指派�把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:4592
+#: g10/keyedit.c:4648
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "已指定這把金鑰為撤銷者了\n"
 
-#: g10/keyedit.c:4610
+#: g10/keyedit.c:4666
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把�把金鑰指派為指定撤銷者後, 就無法�悔了!\n"
 
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4672
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "你確定�指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4740
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -4904,177 +5070,177 @@ msgid ""
 "N) "
 msgstr "你確定�指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:4689
+#: g10/keyedit.c:4745
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更�鑰的使用期�.\n"
 
-#: g10/keyedit.c:4692
+#: g10/keyedit.c:4748
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期�.\n"
 
-#: g10/keyedit.c:4748
+#: g10/keyedit.c:4804
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "你�能變更 v3 金鑰的使用期�\n"
 
-#: g10/keyedit.c:4808
+#: g10/keyedit.c:4864
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "正在變更�鑰的使用期�.\n"
 
-#: g10/keyedit.c:4811
+#: g10/keyedit.c:4867
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "正在變更主鑰的使用期�.\n"
 
-#: g10/keyedit.c:4929
+#: g10/keyedit.c:4985
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "簽署�鑰 %s 已經交��證�了\n"
 
-#: g10/keyedit.c:4935
+#: g10/keyedit.c:4991
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "�鑰 %s ��簽署之用, 因此無須交�驗證\n"
 
-#: g10/keyedit.c:5052
+#: g10/keyedit.c:5108
 msgid "Please select exactly one user ID.\n"
 msgstr "請祇�擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:5093 g10/keyedit.c:5207 g10/keyedit.c:5320 g10/keyedit.c:5458
+#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳�使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:5264
+#: g10/keyedit.c:5320
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入你的�好金鑰伺�器 URL: "
 
-#: g10/keyedit.c:5343
+#: g10/keyedit.c:5399
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "你確定��代它嗎？ (y/N) "
 
-#: g10/keyedit.c:5344
+#: g10/keyedit.c:5400
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "你確定�刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:5404
+#: g10/keyedit.c:5460
 msgid "Enter the notation: "
 msgstr "請輸入註記: "
 
-#: g10/keyedit.c:5551
+#: g10/keyedit.c:5607
 msgid "Proceed? (y/N) "
 msgstr "是�繼續? (y/N) "
 
-#: g10/keyedit.c:5621
+#: g10/keyedit.c:5677
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有�應到使用者 ID\n"
 
-#: g10/keyedit.c:5683
+#: g10/keyedit.c:5739
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有�應到使用者 ID\n"
 
-#: g10/keyedit.c:5784
+#: g10/keyedit.c:5840
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "索引 %d 沒有�應到�鑰\n"
 
-#: g10/keyedit.c:5806
+#: g10/keyedit.c:5862
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有�應到�鑰\n"
 
-#: g10/keyedit.c:5947
+#: g10/keyedit.c:6003
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:5950 g10/keyedit.c:6052 g10/keyedit.c:6100
+#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
 
-#: g10/keyedit.c:5952 g10/keyedit.c:6054 g10/keyedit.c:6102
+#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158
 msgid " (non-exportable)"
 msgstr " (��匯出)"
 
-#: g10/keyedit.c:5956
+#: g10/keyedit.c:6012
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽章已經在 %s �期了.\n"
 
-#: g10/keyedit.c:5961
+#: g10/keyedit.c:6017
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "你確定�然想�撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:5966
+#: g10/keyedit.c:6022
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:6026
+#: g10/keyedit.c:6082
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:6055
+#: g10/keyedit.c:6111
 msgid " (non-revocable)"
 msgstr " (��撤銷)"
 
-#: g10/keyedit.c:6062
+#: g10/keyedit.c:6118
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:6087
+#: g10/keyedit.c:6143
 msgid "You are about to revoke these signatures:\n"
 msgstr "你正�撤銷這些簽章:\n"
 
-#: g10/keyedit.c:6110
+#: g10/keyedit.c:6166
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的�建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:6143
+#: g10/keyedit.c:6199
 #, c-format
 msgid "no secret key\n"
 msgstr "沒有�鑰\n"
 
-#: g10/keyedit.c:6191
+#: g10/keyedit.c:6247
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6201
+#: g10/keyedit.c:6257
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已撤銷\n"
 
-#: g10/keyedit.c:6218
+#: g10/keyedit.c:6274
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:6314
+#: g10/keyedit.c:6370
 #, 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:6352
+#: g10/keyedit.c:6408
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:6414
+#: g10/keyedit.c:6470
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:6511
+#: g10/keyedit.c:6567
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -5531,7 +5697,7 @@ msgstr ""
 "這會讓隨機數字產生器有更多的機會�得夠多的亂數.\n"
 
 #: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395
-#: g10/keygen.c:4739 g10/keygen.c:5242 g10/keygen.c:5537 g10/keygen.c:5642
+#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
@@ -5600,11 +5766,11 @@ msgstr "找�到�寫入的公鑰鑰匙圈: %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
 
-#: g10/keygen.c:5213
+#: g10/keygen.c:5210
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和�鑰已建立�簽署.\n"
 
-#: g10/keygen.c:5229
+#: g10/keygen.c:5226
 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"
@@ -5612,34 +5778,34 @@ msgstr ""
 "請注�這把金鑰�能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的�鑰.\n"
 
-#: g10/keygen.c:5404 g10/keygen.c:5593
+#: g10/keygen.c:5401 g10/keygen.c:5590
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (�能是因為時光旅行或時�的�題)\n"
 
-#: g10/keygen.c:5406 g10/keygen.c:5595
+#: g10/keygen.c:5403 g10/keygen.c:5592
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (�能是因為時光旅行或時�的�題)\n"
 
-#: g10/keygen.c:5417 g10/keygen.c:5606
+#: g10/keygen.c:5414 g10/keygen.c:5603
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注�: � v3 金鑰製造�鑰�符� OpenPGP �範\n"
 
-#: g10/keygen.c:5429 g10/keygen.c:5431
+#: g10/keygen.c:5426 g10/keygen.c:5428
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的�鑰部分無法�用.\n"
 
-#: g10/keygen.c:5438 g10/keygen.c:5440
+#: g10/keygen.c:5435 g10/keygen.c:5437
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的�鑰部分存放於�上.\n"
 
-#: g10/keygen.c:5459 g10/keygen.c:5620
+#: g10/keygen.c:5456 g10/keygen.c:5617
 msgid "Really create? (y/N) "
 msgstr "真的�建立嗎? (y/N) "
 
@@ -5849,263 +6015,263 @@ msgstr "正在� '%s' 請求金鑰\n"
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法抓� URI %s: %s\n"
 
-#: g10/mainproc.c:283
+#: g10/mainproc.c:302
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密�的階段金鑰 (%d) 尺寸詭異\n"
 
-#: g10/mainproc.c:389
+#: g10/mainproc.c:408
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密�的階段金鑰\n"
 
-#: g10/mainproc.c:403
+#: g10/mainproc.c:422
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的 %d 摘�演算法所產生\n"
 
-#: g10/mainproc.c:485
+#: g10/mainproc.c:523
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:599
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密�的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:594
+#: g10/mainproc.c:632
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u �元長的 %s 金鑰,  ID %s, 建立於 %s 所加密\n"
 
-#: g10/mainproc.c:598 g10/pkclist.c:228
+#: g10/mainproc.c:636 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:640
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 所加密\n"
 
-#: g10/mainproc.c:623
+#: g10/mainproc.c:661
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:645 g10/mainproc.c:976
+#: g10/mainproc.c:686 g10/mainproc.c:1066
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "警告: 看到了多份明文\n"
 
-#: g10/mainproc.c:653
+#: g10/mainproc.c:694
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:696
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:689 g10/mainproc.c:710
+#: g10/mainproc.c:730 g10/mainproc.c:751
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "�定 %s 為加密�的資料\n"
 
-#: g10/mainproc.c:696
+#: g10/mainproc.c:737
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法��用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:785 g10/mainproc.c:823
+#: g10/mainproc.c:839 g10/mainproc.c:883
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊�未�到完整的�護\n"
 
-#: g10/mainproc.c:796
+#: g10/mainproc.c:850
 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:799
+#: g10/mainproc.c:853
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:858
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:816
+#: g10/mainproc.c:870
 #, c-format
 msgid "decryption okay\n"
 msgstr "解密�功\n"
 
-#: g10/mainproc.c:829
+#: g10/mainproc.c:889
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密�的訊�已經被變造了!\n"
 
-#: g10/mainproc.c:847
+#: g10/mainproc.c:914
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:892
+#: g10/mainproc.c:982
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注�: 寄件者�求了 \"�准你用眼�看\"\n"
 
-#: g10/mainproc.c:899
+#: g10/mainproc.c:989
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔� ='%.*s'\n"
 
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1244
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "�立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1458 g10/mainproc.c:1501
+#: g10/mainproc.c:1548 g10/mainproc.c:1591
 #, c-format
 msgid "no signature found\n"
 msgstr "找�到簽章\n"
 
-#: g10/mainproc.c:1858
+#: g10/mainproc.c:1948
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*�壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1860
+#: g10/mainproc.c:1950
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "�期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1862
+#: g10/mainproc.c:1952
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1972
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已抑制\n"
 
-#: g10/mainproc.c:1991
+#: g10/mainproc.c:2081
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處�這個�明確的簽章資料\n"
 
-#: g10/mainproc.c:2007 g10/mainproc.c:2014
+#: g10/mainproc.c:2097 g10/mainproc.c:2104
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:2008 g10/mainproc.c:2015 sm/verify.c:476
+#: g10/mainproc.c:2098 g10/mainproc.c:2105 sm/verify.c:476
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:2019
+#: g10/mainproc.c:2109
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:2025
+#: g10/mainproc.c:2115
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                亦� \"%s\""
 
-#: g10/mainproc.c:2076
+#: g10/mainproc.c:2166
 #, c-format
 msgid "Key available at: "
 msgstr "�用的金鑰於: "
 
-#: g10/mainproc.c:2118
+#: g10/mainproc.c:2208
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2334
+#: g10/mainproc.c:2424
 msgid "[uncertain]"
 msgstr "[ �確定 ]"
 
-#: g10/mainproc.c:2372
+#: g10/mainproc.c:2462
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦� \"%s\""
 
-#: g10/mainproc.c:2447
+#: g10/mainproc.c:2537
 #, 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:2465
+#: g10/mainproc.c:2555
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s �期了\n"
 
-#: g10/mainproc.c:2469
+#: g10/mainproc.c:2559
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署將在 %s 到期\n"
 
-#: g10/mainproc.c:2480
+#: g10/mainproc.c:2570
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s 簽章, 摘�演算法 %s%s%s\n"
 
-#: g10/mainproc.c:2481
+#: g10/mainproc.c:2571
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:2482
+#: g10/mainproc.c:2572
 msgid "textmode"
 msgstr "文字模�"
 
-#: g10/mainproc.c:2482 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2572 g10/trust.c:112 dirmngr/ocsp.c:795
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:2484
+#: g10/mainproc.c:2574
 msgid ", key algorithm "
 msgstr ", 金鑰演算法 "
 
-#: g10/mainproc.c:2519
+#: g10/mainproc.c:2609
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2558
+#: g10/mainproc.c:2657
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:2654 g10/mainproc.c:2673 g10/mainproc.c:2797
+#: g10/mainproc.c:2753 g10/mainproc.c:2772 g10/mainproc.c:2896
 #, c-format
 msgid "not a detached signature\n"
 msgstr "�是一份分離的簽章\n"
 
-#: g10/mainproc.c:2707
+#: g10/mainproc.c:2806
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: �測到多�簽章. 祇有第一個簽章纔會被核�.\n"
 
-#: g10/mainproc.c:2716
+#: g10/mainproc.c:2815
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的�立簽章\n"
 
-#: g10/mainproc.c:2801
+#: g10/mainproc.c:2900
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
@@ -6173,67 +6339,67 @@ msgstr "'%s' 讀�錯誤: %s\n"
 msgid "(further info: "
 msgstr ""
 
-#: g10/misc.c:1171
+#: g10/misc.c:1189
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �建議使用的�項 \"%s\"\n"
 
-#: g10/misc.c:1175
+#: g10/misc.c:1193
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: 已�建議使用 \"%s\" �項\n"
 
-#: g10/misc.c:1177
+#: g10/misc.c:1195
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告: \"%s\" 是個棄而�顧的指令 - 別�用了\n"
 
-#: g10/misc.c:1194
+#: g10/misc.c:1212
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: 此檔案內的 \"%s\" 已廢棄 - 僅� %s 有影響\n"
 
-#: g10/misc.c:1198
+#: g10/misc.c:1216
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "警告: \"%s%s\" 是已廢棄的�項 - 除了� %s 之外沒有效果\n"
 
-#: g10/misc.c:1262
+#: g10/misc.c:1280
 msgid "Uncompressed"
 msgstr "未壓縮"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1287
+#: g10/misc.c:1305
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未壓縮|無"
 
-#: g10/misc.c:1394
+#: g10/misc.c:1412
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊�� %s 來說無法使用\n"
 
-#: g10/misc.c:1569
+#: g10/misc.c:1587
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "�明確的�項 '%s'\n"
 
-#: g10/misc.c:1594
+#: g10/misc.c:1612
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "未知的�項 '%s'\n"
 
-#: g10/misc.c:1832
+#: g10/misc.c:1850
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "ECDSA 公鑰應該�是 8 �元�數的 SEC 編碼\n"
 
-#: g10/misc.c:1854
+#: g10/misc.c:1872
 #, fuzzy, c-format
 #| msgid "Unknown signature type '%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6267,23 +6433,23 @@ msgstr "寫到標準輸出中\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "�設被簽署的資料在 '%s'\n"
 
-#: g10/parse-packet.c:289
+#: g10/parse-packet.c:378
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "無法�作 %d 公開金鑰演算法\n"
 
-#: g10/parse-packet.c:1231
+#: g10/parse-packet.c:1320
 #, c-format
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告: �能並�安全的�稱�加密階段金鑰\n"
 
-#: g10/parse-packet.c:1708
+#: g10/parse-packet.c:1797
 #, fuzzy, c-format
 #| msgid "Critical signature notation: "
 msgid "Unknown critical signature notation: "
 msgstr "關�簽章註記: "
 
-#: g10/parse-packet.c:1833
+#: g10/parse-packet.c:1922
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的��包設定了關��元\n"
@@ -6699,12 +6865,12 @@ msgstr "未知的�設收件者 \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "沒有有效的地�\n"
 
-#: g10/pkclist.c:1677
+#: g10/pkclist.c:1685
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "請注�: 金鑰 %s 沒有 %s 功能\n"
 
-#: g10/pkclist.c:1702
+#: g10/pkclist.c:1710
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "警告: 金鑰 %s 沒有 %s 的�好設定\n"
@@ -7135,7 +7301,7 @@ msgstr "已跳�: �鑰已經存在\n"
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並�安全!"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:408
+#: g10/tdbdump.c:57 g10/trustdb.c:451
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
@@ -7180,7 +7346,7 @@ msgstr "在 '%s' 中尋找信任記錄時出錯: %s\n"
 msgid "read error in '%s': %s\n"
 msgstr "'%s' 讀�錯誤: %s\n"
 
-#: g10/tdbdump.c:237 g10/trustdb.c:423
+#: g10/tdbdump.c:237 g10/trustdb.c:466
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: �步化失敗: %s\n"
@@ -7678,145 +7844,145 @@ msgstr ""
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' �是有效的長�金鑰 ID\n"
 
-#: g10/trustdb.c:255
+#: g10/trustdb.c:255 g10/trustdb.c:284
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "金鑰 %s: 如�信任的金鑰般被接�了\n"
 
-#: g10/trustdb.c:293
+#: g10/trustdb.c:336
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "金鑰 %s 在信任資料庫中出�了�止一次\n"
 
-#: g10/trustdb.c:332
+#: g10/trustdb.c:375
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "金鑰 %s: �信任的金鑰沒有公鑰 - 已跳�\n"
 
-#: g10/trustdb.c:343
+#: g10/trustdb.c:386
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "金鑰 %s 已標記�徹底信任了\n"
 
-#: g10/trustdb.c:387
+#: g10/trustdb.c:430
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任記錄 %lu, 請求類別 %d: 讀�失敗: %s\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:436
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任記錄 %lu �是所請求的類別 %d\n"
 
-#: g10/trustdb.c:468
+#: g10/trustdb.c:511
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "你�以試著用下列指令來�建信任資料庫:\n"
 
-#: g10/trustdb.c:477
+#: g10/trustdb.c:520
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "如果行�通的話, 請查閱手冊\n"
 
-#: g10/trustdb.c:527
+#: g10/trustdb.c:570
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "無法使用未知的信任模型 (%d) - �在採用 %s 信任模型\n"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:576
 #, c-format
 msgid "using %s trust model\n"
 msgstr "正在使用 %s 信任模型\n"
 
-#: g10/trustdb.c:582
+#: g10/trustdb.c:625
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "�需�檢查信任資料庫\n"
 
-#: g10/trustdb.c:588 g10/trustdb.c:2283
+#: g10/trustdb.c:631 g10/trustdb.c:2326
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:640
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "在 '%s' 信任模型中並�需�檢查信任資料庫\n"
 
-#: g10/trustdb.c:613
+#: g10/trustdb.c:656
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "在 '%s' 信任模型中並�需�更新信任資料庫\n"
 
-#: g10/trustdb.c:855 g10/trustdb.c:1442
+#: g10/trustdb.c:898 g10/trustdb.c:1485
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找�到公鑰 %s: %s\n"
 
-#: g10/trustdb.c:1075
+#: g10/trustdb.c:1118
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "請�一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1080
+#: g10/trustdb.c:1123
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:2004
+#: g10/trustdb.c:2047
 #, 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:2007
+#: g10/trustdb.c:2050
 #, 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:2077
+#: g10/trustdb.c:2120
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2091
+#: g10/trustdb.c:2134
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "找�到徹底信任金鑰 %s 的公鑰\n"
 
-#: g10/trustdb.c:2209
+#: g10/trustdb.c:2252
 #, 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:2290
+#: g10/trustdb.c:2333
 #, 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 ""
 
@@ -7828,47 +7994,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 ""
 
@@ -7916,33 +8082,33 @@ 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-p15.c:4955 scd/app-openpgp.c:2154
+#: scd/app-p15.c:5116 scd/app-openpgp.c:2154
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-p15.c:4974 scd/app-openpgp.c:2170
+#: scd/app-p15.c:5135 scd/app-openpgp.c:2170
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
 
-#: scd/app-p15.c:5053 scd/app-nks.c:1113
+#: scd/app-p15.c:5214 scd/app-nks.c:1113
 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:5056 scd/app-openpgp.c:2464
+#: scd/app-p15.c:5217 scd/app-openpgp.c:2464
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|請輸入管�者 PIN"
 
-#: scd/app-p15.c:5058 scd/app-nks.c:1103
+#: scd/app-p15.c:5219 scd/app-nks.c:1103
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|請輸入標準金鑰的 PIN �設碼 (PUK)."
 
-#: scd/app-p15.c:5061 scd/app-nks.c:1095
+#: scd/app-p15.c:5222 scd/app-nks.c:1095
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||請輸入標準金鑰的個人識別碼 (PIN)."
 
@@ -8007,7 +8173,7 @@ msgstr "存放指紋失敗: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生日期失敗: %s\n"
 
-#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "從�片�回 CHV 狀態時出錯\n"
@@ -8073,7 +8239,7 @@ msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少�有 %d\n"
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
 
-#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5045
+#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "�片永久鎖定了!!\n"
@@ -8215,13 +8381,13 @@ msgstr "�片�支� %s 摘�演算法\n"
 msgid "signatures created so far: %lu\n"
 msgstr "目�建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:5050
+#: scd/app-openpgp.c:5055
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目�在此指令中的管�者 PIN 驗證被�止了\n"
 
-#: scd/app-openpgp.c:5362 scd/app-openpgp.c:5373
+#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存� %s - 無效的 OpenPGP �片?\n"
@@ -8237,55 +8403,55 @@ msgstr "||請在讀�機�盤上輸入你的個人識別碼 (PIN)"
 msgid "|N|Initial New PIN"
 msgstr "|N|開始新增個人識別碼 (PIN)"
 
-#: scd/scdaemon.c:119
+#: scd/scdaemon.c:120
 msgid "run in multi server mode (foreground)"
 msgstr "以多�伺�器模�執行 (�景)"
 
-#: scd/scdaemon.c:129 sm/gpgsm.c:349 dirmngr/dirmngr.c:190
+#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:201
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|等級|設定除錯等級為指定等級"
 
-#: scd/scdaemon.c:136 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:143
 msgid "|FILE|write a log to FILE"
 msgstr "|檔案|將日誌寫入至指定檔案"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:150
 msgid "|N|connect to reader at port N"
 msgstr "|N|從 N 埠連線至讀�機"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:152
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|�稱|使用指定�稱�為 ct-API 驅動程�"
 
-#: scd/scdaemon.c:142
+#: scd/scdaemon.c:154
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|�稱|使用指定�稱�為 PC/SC 驅動程�"
 
-#: scd/scdaemon.c:146
+#: scd/scdaemon.c:158
 msgid "do not use the internal CCID driver"
 msgstr "��使用內部的 CCID 驅動程�"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:164
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|沒有活動� N 秒後就與�片斷線"
 
-#: scd/scdaemon.c:155
+#: scd/scdaemon.c:167
 msgid "do not use a reader's pinpad"
 msgstr "��使用讀�機�盤"
 
-#: scd/scdaemon.c:160
-msgid "deny the use of admin card commands"
-msgstr "�用管�者�片指令"
-
-#: scd/scdaemon.c:163
+#: scd/scdaemon.c:170
 msgid "use variable length input for pinpad"
 msgstr "輸入 PIN 時在輸入�顯示�變動長度"
 
-#: scd/scdaemon.c:312
+#: scd/scdaemon.c:179
+msgid "deny the use of admin card commands"
+msgstr "�用管�者�片指令"
+
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "用法: @SCDAEMON@ [�項] (或用 -h 求助)"
 
-#: scd/scdaemon.c:314
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8293,21 +8459,27 @@ msgstr ""
 "語法: scdaemon [�項] [指令 [引數]]\n"
 "@GNUPG@ 智慧��務\n"
 
-#: scd/scdaemon.c:808
+#: scd/scdaemon.c:822
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "請使用 '--daemon' �項來將此程�執行於背景\n"
 
-#: scd/scdaemon.c:1185 dirmngr/dirmngr.c:2177
+#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2171
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "用於 fd %d 的經手程�已啟動\n"
 
-#: scd/scdaemon.c:1197 dirmngr/dirmngr.c:2185
+#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2179
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "用於 fd %d 的經手程�已終止\n"
 
+#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285
+#: dirmngr/validate.c:1228
+#, c-format
+msgid "error getting key usage information: %s\n"
+msgstr "�得金鑰用途資訊時出錯: %s\n"
+
 #: sm/certchain.c:198
 #, c-format
 msgid "validation model requested by certificate: %s"
@@ -8365,7 +8537,7 @@ msgstr "從外部�置尋找發行者\n"
 msgid "number of issuers matching: %d\n"
 msgstr "��的發行者數�: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:723 dirmngr/ocsp.c:685
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "無法�得 authorityInfoAccess: %s\n"
@@ -8524,7 +8696,7 @@ msgstr "根憑證未標記為已信任"
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1378 dirmngr/validate.c:630
+#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "憑證�太長\n"
@@ -8578,7 +8750,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u �元的雜湊� %u �元的 %s 金鑰來說是無效的\n"
 
 #: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1403 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1446 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
@@ -8589,7 +8761,7 @@ msgstr "超出核心\n"
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(這是 MD2 演算法)\n"
 
-#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:793
+#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796
 msgid "none"
 msgstr "ç„¡"
 
@@ -8623,42 +8795,37 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "建立於 %s, 於 %s 到期.\n"
 
-#: sm/certlist.c:122 dirmngr/validate.c:1218
+#: sm/certlist.c:124 dirmngr/validate.c:1218
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "沒有指定的金鑰用途 - �設為所有的用途\n"
 
-#: sm/certlist.c:132 sm/keylist.c:283 dirmngr/validate.c:1228
-#, c-format
-msgid "error getting key usage information: %s\n"
-msgstr "�得金鑰用途資訊時出錯: %s\n"
-
-#: sm/certlist.c:143 dirmngr/validate.c:1259
+#: sm/certlist.c:145 dirmngr/validate.c:1259
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "憑證應該還未被用於憑證\n"
 
-#: sm/certlist.c:156 dirmngr/validate.c:1269
+#: sm/certlist.c:158 dirmngr/validate.c:1269
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "憑證應該還未被用於 OCSP 回應簽署\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1252
+#: sm/certlist.c:174 dirmngr/validate.c:1252
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "憑證應該還未被用於加密\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1242
+#: sm/certlist.c:175 dirmngr/validate.c:1242
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "憑證應該還未被用於簽署\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1253
+#: sm/certlist.c:176 dirmngr/validate.c:1253
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "憑證無法用於加密\n"
 
-#: sm/certlist.c:172 dirmngr/validate.c:1243
+#: sm/certlist.c:177 dirmngr/validate.c:1243
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "憑證無法用於簽署\n"
@@ -8844,6 +9011,11 @@ msgstr "�建立自簽憑證嗎? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "採用下列這些�數:\n"
 
+#: sm/certreqgen-ui.c:432
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "建立暫存檔時出錯: %s\n"
+
 #: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "�在正在建立自簽憑證.  "
@@ -8921,123 +9093,123 @@ msgstr "刪除憑證 \"%s\" 時失敗: %s\n"
 msgid "no valid recipients given\n"
 msgstr "沒有給定有效的收件者\n"
 
-#: sm/gpgsm.c:217
+#: sm/gpgsm.c:221
 msgid "list external keys"
 msgstr "列出外部金鑰"
 
-#: sm/gpgsm.c:219
+#: sm/gpgsm.c:223
 msgid "list certificate chain"
 msgstr "列出憑證�"
 
-#: sm/gpgsm.c:227
+#: sm/gpgsm.c:231
 msgid "import certificates"
 msgstr "匯入憑證"
 
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:232
 msgid "export certificates"
 msgstr "匯出憑證"
 
-#: sm/gpgsm.c:236
+#: sm/gpgsm.c:240
 msgid "register a smartcard"
 msgstr "註冊智慧�"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:243
 msgid "pass a command to the dirmngr"
 msgstr "將指令��給 dirmngr"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:245
 msgid "invoke gpg-protect-tool"
 msgstr "�用 gpg-protect-tool"
 
-#: sm/gpgsm.c:258
-msgid "create base-64 encoded output"
-msgstr "建立以 base-64 編碼�的輸出"
+#: sm/gpgsm.c:264
+msgid "don't use the terminal at all"
+msgstr "完全��使用終端機"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:290
+msgid "|N|number of certificates to include"
+msgstr "|N|�包�的憑證數�"
+
+#: sm/gpgsm.c:292
+msgid "|FILE|take policy information from FILE"
+msgstr "|檔案|從指定檔案中�得原則資訊"
+
+#: sm/gpgsm.c:307
 msgid "assume input is in PEM format"
 msgstr "�設輸入的是 PEM 格�"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:309
 msgid "assume input is in base-64 format"
 msgstr "�設輸入的是 base-64 格�"
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:311
 msgid "assume input is in binary format"
 msgstr "�設輸入的是二進制格�"
 
-#: sm/gpgsm.c:278
+#: sm/gpgsm.c:320
+msgid "create base-64 encoded output"
+msgstr "建立以 base-64 編碼�的輸出"
+
+#: sm/gpgsm.c:330
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|使用者-ID|使用指定使用者 ID �為�設�鑰"
+
+#: sm/gpgsm.c:341
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
+
+#: sm/gpgsm.c:352
+msgid "fetch missing issuer certificates"
+msgstr "�回�失的發行者憑證"
+
+#: sm/gpgsm.c:354
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|�稱|將指定�稱的編碼用於 PKCS#12 密語"
+
+#: sm/gpgsm.c:372
 msgid "never consult a CRL"
 msgstr "永���查閱 CRL"
 
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:376
+msgid "do not check CRLs for root certificates"
+msgstr "��為根憑證檢查 CRL"
+
+#: sm/gpgsm.c:380
 msgid "check validity using OCSP"
 msgstr "用 OCSP 檢查有效性"
 
-#: sm/gpgsm.c:293
-msgid "|N|number of certificates to include"
-msgstr "|N|�包�的憑證數�"
-
-#: sm/gpgsm.c:296
-msgid "|FILE|take policy information from FILE"
-msgstr "|檔案|從指定檔案中�得原則資訊"
-
-#: sm/gpgsm.c:299
+#: sm/gpgsm.c:382
 msgid "do not check certificate policies"
 msgstr "��檢查憑證原則"
 
-#: sm/gpgsm.c:303
-msgid "fetch missing issuer certificates"
-msgstr "�回�失的發行者憑證"
-
-#: sm/gpgsm.c:314
-msgid "don't use the terminal at all"
-msgstr "完全��使用終端機"
-
-#: sm/gpgsm.c:316
-msgid "|FILE|write a server mode log to FILE"
-msgstr "|檔案|將伺�器模�日誌寫入至指定檔案"
+#: sm/gpgsm.c:385
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|�稱|使用指定�稱的編密演算法"
 
-#: sm/gpgsm.c:321
-msgid "|FILE|write an audit log to FILE"
-msgstr "|檔案|將稽核日誌寫入至指定檔案"
+#: sm/gpgsm.c:387
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|�稱|使用指定�稱的訊�摘�演算法"
 
-#: sm/gpgsm.c:324
+#: sm/gpgsm.c:398
 msgid "batch mode: never ask"
 msgstr "批次模�: 永��詢�"
 
-#: sm/gpgsm.c:325
+#: sm/gpgsm.c:400
 msgid "assume yes on most questions"
 msgstr "�設大部分的�題都回答是"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:401
 msgid "assume no on most questions"
 msgstr "�設大部分的�題都回答�"
 
-#: sm/gpgsm.c:329
-msgid "|FILE|add keyring to the list of keyrings"
-msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
-
-#: sm/gpgsm.c:332
-msgid "|USER-ID|use USER-ID as default secret key"
-msgstr "|使用者-ID|使用指定使用者 ID �為�設�鑰"
-
-#: sm/gpgsm.c:342 dirmngr/dirmngr.c:217 tools/gpgconf-comp.c:841
-msgid "|SPEC|use this keyserver to lookup keys"
-msgstr "|SPEC|使用此金鑰伺�器來查找金鑰"
-
-#: sm/gpgsm.c:361
-msgid "|NAME|use cipher algorithm NAME"
-msgstr "|�稱|使用指定�稱的編密演算法"
-
-#: sm/gpgsm.c:363
-msgid "|NAME|use message digest algorithm NAME"
-msgstr "|�稱|使用指定�稱的訊�摘�演算法"
+#: sm/gpgsm.c:418
+msgid "|FILE|write an audit log to FILE"
+msgstr "|檔案|將稽核日誌寫入至指定檔案"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:603
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "用法: @GPGSM@ [�項] [檔案] (或用 -h 求助)"
 
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:606
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9047,27 +9219,27 @@ msgstr ""
 "用 S/MIME �定來簽署, 檢查, 加密, 解密\n"
 "�設的�作會�輸入資料而定\n"
 
-#: sm/gpgsm.c:788
+#: sm/gpgsm.c:814
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "請注�: 將無法加密為 '%s': %s\n"
 
-#: sm/gpgsm.c:799
+#: sm/gpgsm.c:825
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "未知的驗證模型 '%s'\n"
 
-#: sm/gpgsm.c:1619
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "正在匯入通用憑證 '%s'\n"
 
-#: sm/gpgsm.c:1662
+#: sm/gpgsm.c:1709
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "無法用 '%s' 來簽署: %s\n"
 
-#: sm/gpgsm.c:2035
+#: sm/gpgsm.c:2063
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無效的指令 (沒有這樣的指令)\n"
@@ -9127,7 +9299,7 @@ msgstr "�新�尋憑證的�題: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "存放旗標時出錯: %s\n"
 
-#: sm/keylist.c:693
+#: sm/keylist.c:711
 msgid "Error - "
 msgstr "錯誤 - "
 
@@ -9162,7 +9334,7 @@ msgstr ""
 "\n"
 "%s%s請�你是�真的確定�這樣�了?"
 
-#: sm/qualified.c:215 sm/verify.c:679
+#: sm/qualified.c:215 sm/verify.c:686
 #, c-format
 msgid ""
 "Note, that this software is not officially approved to create or verify such "
@@ -9211,23 +9383,23 @@ msgstr "[   未給定日期  ]"
 msgid "algorithm:"
 msgstr "演算法: %s"
 
-#: sm/verify.c:536
+#: sm/verify.c:543
 #, c-format
 msgid ""
 "invalid signature: message digest attribute does not match computed one\n"
 msgstr "無效的簽章: 訊�摘�屬性與計算而得的���\n"
 
-#: sm/verify.c:657
+#: sm/verify.c:664
 #, c-format
 msgid "Good signature from"
 msgstr "完好的簽章來自於"
 
-#: sm/verify.c:658
+#: sm/verify.c:665
 #, c-format
 msgid "                aka"
 msgstr "                亦�"
 
-#: sm/verify.c:676
+#: sm/verify.c:683
 #, c-format
 msgid "This is a qualified signature\n"
 msgstr "這是一份�格簽章\n"
@@ -9998,112 +10170,135 @@ msgstr "應該�有絕�檔�\n"
 msgid "looking up '%s'\n"
 msgstr "正在查找 '%s'\n"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:177
 msgid "list the contents of the CRL cache"
 msgstr "列出 CRL 快�的內容"
 
-#: dirmngr/dirmngr.c:174
+#: dirmngr/dirmngr.c:178
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|檔案|從指定檔案載入 CRL 至快�"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:179
 msgid "|URL|fetch a CRL from URL"
 msgstr "|網�|從指定網��得 CRL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:180
 msgid "shutdown the dirmngr"
 msgstr "關閉 dirmngr"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:181
 msgid "flush the cache"
 msgstr "清除快�"
 
-#: dirmngr/dirmngr.c:194 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:745
-#: tools/gpgconf-comp.c:858 tools/gpgconf-comp.c:954
-msgid "|FILE|write server mode logs to FILE"
-msgstr "|檔案|將伺�器模�日誌寫入至指定檔案"
-
-#: dirmngr/dirmngr.c:195
-msgid "run without asking a user"
-msgstr "以�詢�使用者的方�執行"
+#: dirmngr/dirmngr.c:215
+msgid "allow online software version check"
+msgstr ""
 
-#: dirmngr/dirmngr.c:196
-msgid "force loading of outdated CRLs"
-msgstr "強迫載入�時的 CRL"
+#: dirmngr/dirmngr.c:218
+msgid "|N|do not return more than N items in one query"
+msgstr "|N|單次查詢��傳回超� N 筆項目"
 
-#: dirmngr/dirmngr.c:197
-msgid "allow sending OCSP requests"
-msgstr "�許�出 OCSP 請求"
+#: dirmngr/dirmngr.c:225
+msgid "Network related options"
+msgstr ""
 
-#: dirmngr/dirmngr.c:199
-msgid "allow online software version check"
+#: dirmngr/dirmngr.c:227
+msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:200
+#: dirmngr/dirmngr.c:239
+msgid "Configuration for Keyservers"
+msgstr "金鑰伺�器組態"
+
+#: dirmngr/dirmngr.c:242
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|使用�於 URL 的金鑰伺�器"
+
+#: dirmngr/dirmngr.c:244
+msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
+msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
+
+#: dirmngr/dirmngr.c:247
+msgid "Configuration for HTTP servers"
+msgstr "HTTP 伺�器組態"
+
+#: dirmngr/dirmngr.c:249
 msgid "inhibit the use of HTTP"
 msgstr "��使用 HTTP"
 
-#: dirmngr/dirmngr.c:201
-msgid "inhibit the use of LDAP"
-msgstr "��使用 LDAP"
-
-#: dirmngr/dirmngr.c:203
+#: dirmngr/dirmngr.c:251
 msgid "ignore HTTP CRL distribution points"
 msgstr "忽略 HTTP CRL 分布點"
 
-#: dirmngr/dirmngr.c:205
-msgid "ignore LDAP CRL distribution points"
-msgstr "忽略 LDAP CRL 分布點"
-
-#: dirmngr/dirmngr.c:207
-msgid "ignore certificate contained OCSP service URLs"
-msgstr "忽略�有 OCSP 伺�器網�的憑證"
-
-#: dirmngr/dirmngr.c:210
+#: dirmngr/dirmngr.c:253
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|網�|�新導�所有�指定網��出的 HTTP 請求"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:255
+msgid "use system's HTTP proxy setting"
+msgstr "使用系統的 HTTP 代�伺�器設定"
+
+#: dirmngr/dirmngr.c:259
+msgid "Configuration of LDAP servers to use"
+msgstr "�用的 LDAP 伺�器組態"
+
+#: dirmngr/dirmngr.c:261
+msgid "inhibit the use of LDAP"
+msgstr "��使用 LDAP"
+
+#: dirmngr/dirmngr.c:263
+msgid "ignore LDAP CRL distribution points"
+msgstr "忽略 LDAP CRL 分布點"
+
+#: dirmngr/dirmngr.c:265
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|主機|指定 LDAP 查詢主機"
 
-#: dirmngr/dirmngr.c:214
+#: dirmngr/dirmngr.c:267
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "��將主機備案與 --ldap-proxy 並用"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:269
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|使用此金鑰伺�器來查找金鑰"
+
+#: dirmngr/dirmngr.c:271
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|檔案|從指定檔案讀� LDAP 伺�器清單"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:273
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "將從 CRL 分布點發�的新伺�器加入至伺�器清單"
 
-#: dirmngr/dirmngr.c:224
+#: dirmngr/dirmngr.c:276
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|把 LDAP 逾時設� N 秒"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:279
+msgid "Configuration for OCSP"
+msgstr "OCSP 組態"
+
+#: dirmngr/dirmngr.c:281
+msgid "allow sending OCSP requests"
+msgstr "�許�出 OCSP 請求"
+
+#: dirmngr/dirmngr.c:283
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "忽略�有 OCSP 伺�器網�的憑證"
+
+#: dirmngr/dirmngr.c:285
 msgid "|URL|use OCSP responder at URL"
 msgstr "|網�|使用�於指定網�的 OCSP 回應程�"
 
-#: dirmngr/dirmngr.c:229
+#: dirmngr/dirmngr.c:287
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
 
-#: dirmngr/dirmngr.c:235
-msgid "|N|do not return more than N items in one query"
-msgstr "|N|單次查詢��傳回超� N 筆項目"
-
-#: dirmngr/dirmngr.c:240
-msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
-msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
-
-#: dirmngr/dirmngr.c:242
-msgid "route all network traffic via Tor"
-msgstr ""
+#: dirmngr/dirmngr.c:295
+msgid "force loading of outdated CRLs"
+msgstr "強迫載入�時的 CRL"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:306
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10112,11 +10307,11 @@ msgstr ""
 "@\n"
 "(請�照「資訊�手冊來�得所有命令和�項的完整清單)\n"
 
-#: dirmngr/dirmngr.c:425
+#: dirmngr/dirmngr.c:459
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "用法: @DIRMNGR@ [�項] (或用 -h 求助)"
 
-#: dirmngr/dirmngr.c:427
+#: dirmngr/dirmngr.c:461
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10124,83 +10319,83 @@ msgstr ""
 "語法: @DIRMNGR@ [�項] [指令 [引數]]\n"
 "@GNUPG@ 的金鑰伺�器, CRL, OCSP 存�\n"
 
-#: dirmngr/dirmngr.c:507
+#: dirmngr/dirmngr.c:541
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有效的除錯等級為: %s\n"
 
-#: dirmngr/dirmngr.c:593 tools/gpgconf.c:699 tools/gpgconf.c:734
-#: tools/gpgconf.c:832
+#: dirmngr/dirmngr.c:636 tools/gpgconf.c:706 tools/gpgconf.c:741
+#: tools/gpgconf.c:839
 #, c-format
 msgid "usage: %s [options] "
 msgstr "用法: %s [�項] "
 
-#: dirmngr/dirmngr.c:1287
+#: dirmngr/dirmngr.c:1330
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "socket �稱內��許使用冒號\n"
 
-#: dirmngr/dirmngr.c:1523 dirmngr/server.c:1878
+#: dirmngr/dirmngr.c:1566 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "從 '%s' �回 CRL 時失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1529 dirmngr/server.c:1884
+#: dirmngr/dirmngr.c:1572 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "從 '%s' 處� CRL 時失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1724
+#: dirmngr/dirmngr.c:1718
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 列太長 - 已跳�\n"
 
-#: dirmngr/dirmngr.c:1784 dirmngr/dirmngr.c:1873
+#: dirmngr/dirmngr.c:1778 dirmngr/dirmngr.c:1867
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: �測到無效的指紋\n"
 
-#: dirmngr/dirmngr.c:1825 dirmngr/dirmngr.c:1851 tools/gpgconf-comp.c:4245
+#: dirmngr/dirmngr.c:1819 dirmngr/dirmngr.c:1845 tools/gpgconf-comp.c:3427
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 讀�錯誤: %s\n"
 
-#: dirmngr/dirmngr.c:1886
+#: dirmngr/dirmngr.c:1880
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 列尾的垃圾已忽略\n"
 
-#: dirmngr/dirmngr.c:1955
+#: dirmngr/dirmngr.c:1949
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "收到 SIGHUP - 正在�新讀�組態並清除快�\n"
 
-#: dirmngr/dirmngr.c:1995
+#: dirmngr/dirmngr.c:1989
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "收到 SIGUSR2 - 無定義行動\n"
 
-#: dirmngr/dirmngr.c:2000
+#: dirmngr/dirmngr.c:1994
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "收到 SIGTERM - 正在關閉 ...\n"
 
-#: dirmngr/dirmngr.c:2002
+#: dirmngr/dirmngr.c:1996
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
 
-#: dirmngr/dirmngr.c:2007
+#: dirmngr/dirmngr.c:2001
 #, c-format
 msgid "shutdown forced\n"
 msgstr "已強迫關閉\n"
 
-#: dirmngr/dirmngr.c:2015
+#: dirmngr/dirmngr.c:2009
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "收到 SIGINT - 立�關閉\n"
 
-#: dirmngr/dirmngr.c:2022
+#: dirmngr/dirmngr.c:2016
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "收到訊號 %d - 無定義行動\n"
@@ -10392,91 +10587,91 @@ msgstr "計算 '%s' OSCP 回應雜湊時失敗: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "並未由�設 OCSP 簽署者的憑證所簽署"
 
-#: dirmngr/ocsp.c:522
+#: dirmngr/ocsp.c:524
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "�置清單項目時失敗: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "�得回應程� ID 時出錯: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:587
 #, 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:626 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "找�到發行者憑證: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:636
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "�用者未傳為目標憑證\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:643
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "�用者未傳回發行的憑證\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:653
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "�置 OCSP 脈絡失敗: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:692
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "無定義�設 OCSP 回應程�\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:698
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "未定義�設的 OCSP 簽署程�\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:705
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "正在使用�設的 OCSP 回應程� '%s'\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "正在使用 %s OCSP 回應程�\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:767
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "�得目標憑證 OCSP 狀態時出錯: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:792
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "憑證狀態為: %s  (本次=%s  下次=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:793
 msgid "good"
 msgstr "良好"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:799
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "憑證已撤銷於 %s 因: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP 回應程�傳回未來的狀態\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:846
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP 回應程�傳回�當下的狀態\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:861
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP 回應程�傳回�舊的狀態\n"
@@ -10486,67 +10681,67 @@ msgstr "OCSP 回應程�傳回�舊的狀態\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) 失敗: %s\n"
 
-#: dirmngr/server.c:1277
+#: dirmngr/server.c:1284
 msgid "serialno missing in cert ID"
 msgstr "憑證 ID 中�失 serialno"
 
-#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
-#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
+#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970
+#: dirmngr/server.c:2041 dirmngr/server.c:2669 dirmngr/server.c:2684
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire 失敗: %s\n"
 
-#: dirmngr/server.c:1569
+#: dirmngr/server.c:1576
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url 失敗: %s\n"
 
-#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
+#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "�出資料時出錯: %s\n"
 
-#: dirmngr/server.c:1720
+#: dirmngr/server.c:1727
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch 失敗: %s\n"
 
-#: dirmngr/server.c:1753
+#: dirmngr/server.c:1760
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert 失敗: %s\n"
 
-#: dirmngr/server.c:1780
+#: dirmngr/server.c:1787
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d 已超出\n"
 
-#: dirmngr/server.c:2966
+#: dirmngr/server.c:2973
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "無法�置控制�構: %s\n"
 
-#: dirmngr/server.c:2977
+#: dirmngr/server.c:2984
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "�置 assuan 脈絡失敗: %s\n"
 
-#: dirmngr/server.c:2998
+#: dirmngr/server.c:3005
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "伺�器啟始失敗: %s\n"
 
-#: dirmngr/server.c:3006
+#: dirmngr/server.c:3013
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "� Assuan 註冊指令時失敗: %s\n"
 
-#: dirmngr/server.c:3039
+#: dirmngr/server.c:3046
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan 接��題: %s\n"
 
-#: dirmngr/server.c:3058
+#: dirmngr/server.c:3065
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan 處�時失敗: %s\n"
@@ -10589,7 +10784,7 @@ msgstr "憑證�完好\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "憑證應該還未被用於 CRL 簽署\n"
 
-#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:110
+#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111
 msgid "quiet"
 msgstr "安�模�"
 
@@ -10682,299 +10877,148 @@ msgstr "�出列時失敗: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "�出標準�項時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:808 tools/gpgconf-comp.c:910
-msgid "Options controlling the diagnostic output"
-msgstr "控制著診斷性輸出的�項"
-
-#: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:821 tools/gpgconf-comp.c:933
-msgid "Options controlling the configuration"
-msgstr "控制著組態的�項"
-
-#: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:740
-#: tools/gpgconf-comp.c:853 tools/gpgconf-comp.c:946
-msgid "Options useful for debugging"
-msgstr "�除錯有幫助的�項"
-
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:866
-msgid "Options controlling the security"
-msgstr "控制著安全性的�項"
-
-#: tools/gpgconf-comp.c:537
-msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|在 N 秒之後讓 SSH 金鑰�期"
-
-#: tools/gpgconf-comp.c:541
-msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|把個人識別碼 (PIN) 快�最大生存時間設� N 秒"
-
-#: tools/gpgconf-comp.c:545
-msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|把 SSH 金鑰最大生存時間設� N 秒"
-
-#: tools/gpgconf-comp.c:569
-msgid "Options enforcing a passphrase policy"
-msgstr "強制執行密語原則的�項"
-
-#: tools/gpgconf-comp.c:572
-msgid "do not allow bypassing the passphrase policy"
-msgstr "��許略�密語原則"
-
-#: tools/gpgconf-comp.c:576
-msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|把新密語所需的最短長度設� N"
-
-#: tools/gpgconf-comp.c:580
-msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr "|N|新密語至少�有 N 個�字�的字符"
-
-#: tools/gpgconf-comp.c:584
-msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|檔案|用指定檔案中的樣�來檢查新密語"
-
-#: tools/gpgconf-comp.c:588
-msgid "|N|expire the passphrase after N days"
-msgstr "|N|在 N 天之後讓密語�期"
-
-#: tools/gpgconf-comp.c:592
-msgid "do not allow the reuse of old passphrases"
-msgstr "��許�複使用舊密語"
-
-#: tools/gpgconf-comp.c:596
-#, fuzzy
-#| msgid "|N|set LDAP timeout to N seconds"
-msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|把 LDAP 逾時設� N 秒"
-
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:823
-msgid "|NAME|use NAME as default secret key"
-msgstr "|�字|使用指定�字�為�設�鑰"
-
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:826
-msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|�字|也加密給指定�字的使用者 ID"
-
-#: tools/gpgconf-comp.c:713
-msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|設定電�郵件別�"
-
-#: tools/gpgconf-comp.c:753 tools/gpgconf-comp.c:985
-msgid "Configuration for Keyservers"
-msgstr "金鑰伺�器組態"
-
-#: tools/gpgconf-comp.c:755 tools/gpgconf-comp.c:987
-msgid "|URL|use keyserver at URL"
-msgstr "|URL|使用�於 URL 的金鑰伺�器"
-
-#: tools/gpgconf-comp.c:758
-msgid "allow PKA lookups (DNS requests)"
-msgstr "�許 PKA 查找 (DNS 請求)"
-
-#: tools/gpgconf-comp.c:761
-msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地�找出金鑰"
-
-#: tools/gpgconf-comp.c:764
-#, fuzzy
-#| msgid "import keys from a keyserver"
-msgid "import missing key from a signature"
-msgstr "從金鑰伺�器匯入金鑰"
-
-#: tools/gpgconf-comp.c:767
-#, fuzzy
-#| msgid "list and check key signatures"
-msgid "include the public key in signatures"
-msgstr "列出並檢查金鑰簽章"
-
-#: tools/gpgconf-comp.c:774 tools/gpgconf-comp.c:835
-msgid "disable all access to the dirmngr"
-msgstr "�用所有的 dirmngr 存�"
-
-#: tools/gpgconf-comp.c:838
-msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|�稱|將指定�稱的編碼用於 PKCS#12 密語"
-
-#: tools/gpgconf-comp.c:874
-msgid "do not check CRLs for root certificates"
-msgstr "��為根憑證檢查 CRL"
-
-#: tools/gpgconf-comp.c:923
-msgid "Options controlling the format of the output"
-msgstr "控制著輸出格�的�項"
-
-#: tools/gpgconf-comp.c:965
-msgid "Options controlling the interactivity and enforcement"
-msgstr "控制著互動�強制執行的�項"
-
-#: tools/gpgconf-comp.c:978
-#, fuzzy
-#| msgid "Options controlling the security"
-msgid "Options controlling the use of Tor"
-msgstr "控制著安全性的�項"
-
-#: tools/gpgconf-comp.c:992
-msgid "Configuration for HTTP servers"
-msgstr "HTTP 伺�器組態"
-
-#: tools/gpgconf-comp.c:1003
-msgid "use system's HTTP proxy setting"
-msgstr "使用系統的 HTTP 代�伺�器設定"
-
-#: tools/gpgconf-comp.c:1008
-msgid "Configuration of LDAP servers to use"
-msgstr "�用的 LDAP 伺�器組態"
-
-#: tools/gpgconf-comp.c:1037
-msgid "LDAP server list"
-msgstr "LDAP 伺�器清單"
-
-#: tools/gpgconf-comp.c:1045
-msgid "Configuration for OCSP"
-msgstr "OCSP 組態"
-
-#: tools/gpgconf-comp.c:1098
+#: tools/gpgconf-comp.c:625
 #, fuzzy
 #| msgid "GPG for OpenPGP"
 msgid "OpenPGP"
 msgstr "OpenPGP 版 GPG"
 
-#: tools/gpgconf-comp.c:1099
+#: tools/gpgconf-comp.c:629
+#, fuzzy
+#| msgid "GPG for S/MIME"
+msgid "S/MIME"
+msgstr "S/MIME 版 GPG"
+
+#: tools/gpgconf-comp.c:633
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1100
+#: tools/gpgconf-comp.c:637
 #, fuzzy
 #| msgid "Smartcard Daemon"
 msgid "Smartcards"
 msgstr "智慧��務"
 
-#: tools/gpgconf-comp.c:1101
-#, fuzzy
-#| msgid "GPG for S/MIME"
-msgid "S/MIME"
-msgstr "S/MIME 版 GPG"
-
-#: tools/gpgconf-comp.c:1102
+#: tools/gpgconf-comp.c:641
 msgid "Network"
 msgstr ""
 
-#: tools/gpgconf-comp.c:1103
+#: tools/gpgconf-comp.c:645
 #, fuzzy
 #| msgid "PIN and Passphrase Entry"
 msgid "Passphrase Entry"
 msgstr "個人識別碼�密語項目"
 
-#: tools/gpgconf-comp.c:1282
+#: tools/gpgconf-comp.c:822
 msgid "Component not suitable for launching"
 msgstr "元件���啟動"
 
-#: tools/gpgconf-comp.c:1288
+#: tools/gpgconf-comp.c:828
 #, 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:1291
+#: tools/gpgconf-comp.c:831
 #, 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:3500
+#: tools/gpgconf-comp.c:2705
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "元件 %s 的外部驗證失敗"
 
-#: tools/gpgconf-comp.c:3651
+#: tools/gpgconf-comp.c:2834
 msgid "Note that group specifications are ignored\n"
 msgstr "請注�群組�格已忽略\n"
 
-#: tools/gpgconf-comp.c:4249
+#: tools/gpgconf-comp.c:3431
 #, fuzzy, c-format
 #| msgid "error closing '%s': %s\n"
 msgid "error closing '%s'\n"
 msgstr "關閉 '%s' 時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:4251
+#: tools/gpgconf-comp.c:3433
 #, fuzzy, c-format
 #| msgid "error hashing '%s': %s\n"
 msgid "error parsing '%s'\n"
 msgstr "計算 '%s' 的雜湊時出錯: %s\n"
 
-#: tools/gpgconf.c:81
+#: tools/gpgconf.c:82
 msgid "list all components"
 msgstr "列出所有的元件"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "check all programs"
 msgstr "檢查所有的程�"
 
-#: tools/gpgconf.c:83
+#: tools/gpgconf.c:84
 msgid "|COMPONENT|list options"
 msgstr "|元件|列出�項"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|COMPONENT|change options"
 msgstr "|元件|變更�項"
 
-#: tools/gpgconf.c:85
+#: tools/gpgconf.c:86
 msgid "|COMPONENT|check options"
 msgstr "|元件|檢查�項"
 
-#: tools/gpgconf.c:87
+#: tools/gpgconf.c:88
 msgid "apply global default values"
 msgstr "套用全域�設值"
 
-#: tools/gpgconf.c:89
+#: tools/gpgconf.c:90
 #, fuzzy
 #| msgid "|FILE|take policy information from FILE"
 msgid "|FILE|update configuration files using FILE"
 msgstr "|檔案|從指定檔案中�得原則資訊"
 
-#: tools/gpgconf.c:91
+#: tools/gpgconf.c:92
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "�得 @GPGCONF@ 的組態目錄"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "list global configuration file"
 msgstr "列出全域組態檔"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "check global configuration file"
 msgstr "檢查全域組態檔案"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:98
 #, fuzzy
 #| msgid "update the trust database"
 msgid "query the software version database"
 msgstr "更新信任資料庫"
 
-#: tools/gpgconf.c:98
+#: tools/gpgconf.c:99
 msgid "reload all or a given component"
 msgstr "�新載入所有或給定的元件"
 
-#: tools/gpgconf.c:99
+#: tools/gpgconf.c:100
 msgid "launch a given component"
 msgstr "啟動給定的元件"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:101
 msgid "kill a given component"
 msgstr "刪除給定的元件"
 
-#: tools/gpgconf.c:108
+#: tools/gpgconf.c:109
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: tools/gpgconf.c:112
+#: tools/gpgconf.c:113
 msgid "activate changes at runtime, if possible"
 msgstr "如果�能的話, 在執行期啟用變更"
 
-#: tools/gpgconf.c:156
+#: tools/gpgconf.c:157
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "用法: @GPGCONF@ [�項] (或用 -h 求助)"
 
-#: tools/gpgconf.c:159
+#: tools/gpgconf.c:160
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10982,15 +11026,15 @@ msgstr ""
 "語法: @GPGCONF@ [�項]\n"
 "管� @GNUPG@ 系統工具的組態�項\n"
 
-#: tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:708 tools/gpgconf.c:743
 msgid "Need one component argument"
 msgstr "需�一個元件引數"
 
-#: tools/gpgconf.c:710 tools/gpgconf.c:760 tools/gpgconf.c:808
+#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815
 msgid "Component not found"
 msgstr "找�到元件"
 
-#: tools/gpgconf.c:834
+#: tools/gpgconf.c:841
 msgid "No argument allowed"
 msgstr "未�許使用引數"
 
@@ -11006,6 +11050,42 @@ msgstr ""
 "語法: gpg-check-pattern [�項] 樣�檔案\n"
 "用樣�檔案來檢查由標準輸入給定的密語\n"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "寫入暫存檔時出錯: %s\n"
+
+#~ msgid "use a log file for the server"
+#~ msgstr "為伺�器使用日誌檔"
+
+#~ msgid "|FILE|write a server mode log to FILE"
+#~ msgstr "|檔案|將伺�器模�日誌寫入至指定檔案"
+
+#~ msgid "run without asking a user"
+#~ msgstr "以�詢�使用者的方�執行"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "�許 PKA 查找 (DNS 請求)"
+
+#, fuzzy
+#~| msgid "import keys from a keyserver"
+#~ msgid "import missing key from a signature"
+#~ msgstr "從金鑰伺�器匯入金鑰"
+
+#, fuzzy
+#~| msgid "list and check key signatures"
+#~ msgid "include the public key in signatures"
+#~ msgstr "列出並檢查金鑰簽章"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "控制著輸出格�的�項"
+
+#, fuzzy
+#~| msgid "Options controlling the security"
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "控制著安全性的�項"
+
+#~ msgid "LDAP server list"
+#~ msgstr "LDAP 伺�器清單"
+
 #~ msgid "requesting key %s from %s server %s\n"
 #~ msgstr "正在請求金鑰 %s 自 %s 伺�器 %s\n"
 
@@ -11177,9 +11257,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "無法開啟 %s 來寫入: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "寫入 %s 時出錯: %s\n"
-
 #~ msgid "error reading from %s: %s\n"
 #~ msgstr "讀� %s 時出錯: %s\n"
 
@@ -11347,9 +11424,6 @@ msgstr ""
 #~ msgid "listen() failed: %s\n"
 #~ msgstr "listen() 失敗: %s\n"
 
-#~ msgid "do not grab keyboard and mouse"
-#~ msgstr "��奪��盤�滑鼠"
-
 #~ msgid "Error: URL too long (limit is %d characters).\n"
 #~ msgstr "錯誤: URL 太長 (上�是 %d 個字符).\n"
 
diff --git a/regexp/Makefile.in b/regexp/Makefile.in
index 4b48a5c..6e03b82 100644
--- a/regexp/Makefile.in
+++ b/regexp/Makefile.in
@@ -247,6 +247,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/scd/Makefile.in b/scd/Makefile.in
index 0b8eb03..d278ee5 100644
--- a/scd/Makefile.in
+++ b/scd/Makefile.in
@@ -292,6 +292,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/scd/apdu.c b/scd/apdu.c
index 254353a..9568d25 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -366,9 +366,23 @@ static int pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
 
 
 /*
-      Helper
+ *    Helper
  */
 
+/* Return true if (BUFFER,LENGTH) consists of only binary zeroes.  */
+static int
+all_zero_p (const void *buffer, size_t length)
+{
+  const unsigned char *p;
+
+  for (p=buffer; length; p++, length--)
+    if (*p)
+      return 0;
+  return 1;
+}
+
+
+
 static int
 lock_slot (int slot)
 {
@@ -1199,7 +1213,8 @@ select_a_reader (const char *list, unsigned int len)
   };
   const char *white_list_to_prefer[] = {
     /* We do substring match by strstr(3).  */
-    "SPRx32"
+    "SPRx32",
+    "Yubico"
   };
   const char *p = list;
   const char *candidate = NULL;
@@ -1262,7 +1277,7 @@ open_pcsc_reader (const char *portstr)
   int slot;
   char *list = NULL;
   const char *rdrname = NULL;
-  pcsc_dword_t nreader;
+  pcsc_dword_t nreader = 0;
   const char *p;
   size_t n;
   membuf_t reader_mb;
@@ -3008,7 +3023,12 @@ send_le (int slot, int class, int ins, int p0, int p1,
       log_debug (" response: sw=%04X  datalen=%d\n",
                  sw, (unsigned int)resultlen);
       if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA))
-        log_printhex (result, resultlen, "    dump: ");
+        {
+          if (all_zero_p (result, resultlen))
+            log_debug ("     dump: [all zero]\n");
+          else
+            log_printhex (result, resultlen, "     dump:");
+        }
     }
 
   if (sw == SW_SUCCESS || sw == SW_EOF_REACHED)
@@ -3081,7 +3101,12 @@ send_le (int slot, int class, int ins, int p0, int p1,
               log_debug ("     more: sw=%04X  datalen=%d\n",
                          sw, (unsigned int)resultlen);
               if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA))
-                log_printhex (result, resultlen, "     dump: ");
+                {
+                  if (all_zero_p (result, resultlen))
+                    log_debug ( "    dump: [all zero]\n");
+                  else
+                    log_printhex (result, resultlen, "      dump:");
+                }
             }
 
           if ((sw & 0xff00) == SW_MORE_DATA
@@ -3127,7 +3152,12 @@ send_le (int slot, int class, int ins, int p0, int p1,
   xfree (result_buffer);
 
   if (DBG_CARD_IO && retbuf && sw == SW_SUCCESS)
-    log_printhex (*retbuf, *retbuflen, "      dump: ");
+    {
+      if (all_zero_p (*retbuf, *retbuflen))
+        log_debug ("     dump: [all zero]\n");
+      else
+        log_printhex (*retbuf, *retbuflen, "     dump:");
+    }
 
   return sw;
 }
@@ -3266,7 +3296,7 @@ apdu_send_direct (int slot, size_t extended_length,
     }
 #undef SHORT_RESULT_BUFFER_SIZE
 
-  if ((sw = trylock_slot (slot)))
+  if ((sw = lock_slot (slot)))
     {
       xfree (apdu_buffer);
       xfree (result_buffer);
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 2b8e780..da6dc7a 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -252,7 +252,7 @@ static gpg_error_t do_auth (app_t app, ctrl_t ctrl, const char *keyidstr,
                             void *pincb_arg,
                             const void *indata, size_t indatalen,
                             unsigned char **outdata, size_t *outdatalen);
-static void parse_algorithm_attribute (app_t app, int keyno);
+static gpg_error_t parse_algorithm_attribute (app_t app, int keyno);
 static gpg_error_t change_keyattr_from_string
                            (app_t app,
                             gpg_error_t (*pincb)(void*, const char *, char **),
@@ -361,7 +361,7 @@ get_cached_data (app_t app, int tag,
               {
                 p = xtrymalloc (c->length);
                 if (!p)
-                  return gpg_error (gpg_err_code_from_errno (errno));
+                  return gpg_error_from_syserror ();
                 memcpy (p, c->data, c->length);
                 *result = p;
               }
@@ -3384,7 +3384,7 @@ change_keyattr (app_t app, int keyno, const unsigned char *buf, size_t buflen,
   else
     log_info ("key attribute changed (key=%d)\n", keyno+1);
   flush_cache (app);
-  parse_algorithm_attribute (app, keyno);
+  err = parse_algorithm_attribute (app, keyno);
   app->did_chv1 = 0;
   app->did_chv2 = 0;
   app->did_chv3 = 0;
@@ -4738,6 +4738,11 @@ do_auth (app_t app, ctrl_t ctrl, const char *keyidstr,
           exmode = 1;    /* Use extended length.  */
           le_value = app->app_local->keyattr[2].rsa.n_bits / 8;
         }
+      else if (app->app_local->cardcap.cmd_chaining && indatalen > 254)
+        {
+          exmode = -254; /* Command chaining with max. 254 bytes.  */
+          le_value = 0;
+        }
       else if (indatalen > 255)
         {
           if (!app->app_local->cardcap.ext_lc_le)
@@ -5186,13 +5191,14 @@ ecc_curve (unsigned char *buf, size_t buflen)
 
 /* Parse and optionally show the algorithm attributes for KEYNO.
    KEYNO must be in the range 0..2.  */
-static void
+static gpg_error_t
 parse_algorithm_attribute (app_t app, int keyno)
 {
   unsigned char *buffer;
   size_t buflen;
   void *relptr;
   const char desc[3][5] = {"sign", "encr", "auth"};
+  gpg_error_t err = 0;
 
   assert (keyno >=0 && keyno <= 2);
 
@@ -5203,13 +5209,13 @@ parse_algorithm_attribute (app_t app, int keyno)
   if (!relptr)
     {
       log_error ("error reading DO 0x%02X\n", 0xc1+keyno);
-      return;
+      return gpg_error (GPG_ERR_CARD);
     }
   if (buflen < 1)
     {
       log_error ("error reading DO 0x%02X\n", 0xc1+keyno);
       xfree (relptr);
-      return;
+      return gpg_error (GPG_ERR_CARD);
     }
 
   if (opt.verbose)
@@ -5246,17 +5252,34 @@ parse_algorithm_attribute (app_t app, int keyno)
 
       app->app_local->keyattr[keyno].ecc.flags = 0;
 
-      if (buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
-        { /* Found "pubkey required"-byte for private key template.  */
-          oidlen--;
-          if (buffer[buflen-1] == 0xff)
-            app->app_local->keyattr[keyno].ecc.flags |= ECC_FLAG_PUBKEY;
+      if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY)
+        {
+          /* Yubikey implementations vary.
+           * Firmware version 5.2 returns "pubkey required"-byte with
+           * 0x00, but after removal and second time insertion, it
+           * returns bogus value there.
+           * Firmware version 5.4 returns none.
+           */
+          curve = ecc_curve (buffer + 1, oidlen);
+          if (!curve)
+            curve = ecc_curve (buffer + 1, oidlen - 1);
+        }
+      else
+        {
+          if (buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
+            { /* Found "pubkey required"-byte for private key template.  */
+              oidlen--;
+              if (buffer[buflen-1] == 0xff)
+                app->app_local->keyattr[keyno].ecc.flags |= ECC_FLAG_PUBKEY;
+            }
+          curve = ecc_curve (buffer + 1, oidlen);
         }
-
-      curve = ecc_curve (buffer + 1, oidlen);
 
       if (!curve)
-        log_printhex (buffer+1, buflen-1, "Curve with OID not supported: ");
+        {
+          log_printhex (buffer+1, buflen-1, "Curve with OID not supported: ");
+          err = gpg_error (GPG_ERR_CARD);
+        }
       else
         {
           app->app_local->keyattr[keyno].key_type = KEY_TYPE_ECC;
@@ -5277,6 +5300,7 @@ parse_algorithm_attribute (app_t app, int keyno)
     log_printhex (buffer, buflen, "");
 
   xfree (relptr);
+  return err;
 }
 
 /* Select the OpenPGP application on the card in SLOT.  This function
@@ -5286,15 +5310,15 @@ app_select_openpgp (app_t app)
 {
   static char const aid[] = { 0xD2, 0x76, 0x00, 0x01, 0x24, 0x01 };
   int slot = app->slot;
-  int rc;
+  gpg_error_t err;
   unsigned char *buffer;
   size_t buflen;
   void *relptr;
 
   /* Note that the card can't cope with P2=0xCO, thus we need to pass a
      special flag value. */
-  rc = iso7816_select_application (slot, aid, sizeof aid, 0x0001);
-  if (!rc)
+  err = iso7816_select_application (slot, aid, sizeof aid, 0x0001);
+  if (!err)
     {
       unsigned int manufacturer;
 
@@ -5310,8 +5334,8 @@ app_select_openpgp (app_t app)
          replace a possibly already set one from a EF.GDO with this
          one.  Note, that for current OpenPGP cards, no EF.GDO exists
          and thus it won't matter at all. */
-      rc = iso7816_get_data (slot, 0, 0x004F, &buffer, &buflen);
-      if (rc)
+      err = iso7816_get_data (slot, 0, 0x004F, &buffer, &buflen);
+      if (err)
         goto leave;
       if (opt.verbose)
         {
@@ -5330,7 +5354,7 @@ app_select_openpgp (app_t app)
       app->app_local = xtrycalloc (1, sizeof *app->app_local);
       if (!app->app_local)
         {
-          rc = gpg_error (gpg_err_code_from_errno (errno));
+          err = gpg_error_from_syserror ();
           goto leave;
         }
 
@@ -5361,6 +5385,7 @@ app_select_openpgp (app_t app)
         {
           log_error (_("can't access %s - invalid OpenPGP card?\n"),
                      "CHV Status Bytes");
+          err = gpg_error (GPG_ERR_CARD);
           goto leave;
         }
       app->force_chv1 = (buflen && *buffer == 0);
@@ -5372,6 +5397,7 @@ app_select_openpgp (app_t app)
         {
           log_error (_("can't access %s - invalid OpenPGP card?\n"),
                      "Extended Capability Flags" );
+          err = gpg_error (GPG_ERR_CARD);
           goto leave;
         }
       if (buflen)
@@ -5420,9 +5446,13 @@ app_select_openpgp (app_t app)
       if (opt.verbose)
         show_caps (app->app_local);
 
-      parse_algorithm_attribute (app, 0);
-      parse_algorithm_attribute (app, 1);
-      parse_algorithm_attribute (app, 2);
+      err = parse_algorithm_attribute (app, 0);
+      if (!err)
+        err = parse_algorithm_attribute (app, 1);
+      if (!err)
+        err = parse_algorithm_attribute (app, 2);
+      if (err)
+        goto leave;
 
       if (opt.verbose > 1)
         dump_all_do (slot);
@@ -5444,7 +5474,7 @@ app_select_openpgp (app_t app)
    }
 
 leave:
-  if (rc)
+  if (err)
     do_deinit (app);
-  return rc;
+  return err;
 }
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 0530d37..2884e0d 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;
@@ -85,7 +86,8 @@ typedef enum
   {
     CARD_PRODUCT_UNKNOWN,
     CARD_PRODUCT_RSCS,     /* Rohde&Schwarz Cybersecurity       */
-    CARD_PRODUCT_DTRUST    /* D-Trust GmbH (bundesdruckerei.de) */
+    CARD_PRODUCT_DTRUST,   /* D-Trust GmbH (bundesdruckerei.de) */
+    CARD_PRODUCT_GENUA     /* GeNUA mbH                         */
   }
 card_product_t;
 
@@ -120,6 +122,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 +157,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 +385,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 +437,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 +457,14 @@ struct app_local_s
   /* The vendor's product.  */
   card_product_t card_product;
 
+  /* Flag indicating that extended_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. */
@@ -457,7 +481,7 @@ struct app_local_s
     unsigned short auth_objects;
   } odf;
 
-  /* The PKCS#15 serialnumber from EF(TokeiNFo) or NULL.  Malloced. */
+  /* The PKCS#15 serialnumber from EF(TokenInfo) or NULL.  Malloced. */
   unsigned char *serialno;
   size_t serialnolen;
 
@@ -512,6 +536,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 "";
 }
@@ -524,6 +549,7 @@ cardproduct2str (card_product_t cardproduct)
     case CARD_PRODUCT_UNKNOWN: return "";
     case CARD_PRODUCT_RSCS:    return "R&S";
     case CARD_PRODUCT_DTRUST:  return "D-Trust";
+    case CARD_PRODUCT_GENUA:   return "GeNUA";
     }
   return "";
 }
@@ -763,6 +789,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 )
@@ -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,13 +2745,14 @@ 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;
             }
@@ -2706,7 +2764,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 +2780,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 +2839,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 +2847,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)
+              {
+                err = gpg_error (GPG_ERR_ENCODING_PROBLEM);
+                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 &= ~mask;
-                mask = 0;
+                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 = *pp++; nn--; objlen--;
-            if (full)
-              full--;
-            else
+            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 +2997,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 +3186,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 +3203,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");
         }
 
@@ -3498,6 +3572,14 @@ read_p15_info (app_t app)
 
   release_lists (app);
 
+  if (IS_CARDOS_5 (app)
+      && app->app_local->manufacturer_id
+      && !ascii_strcasecmp (app->app_local->manufacturer_id, "GeNUA mbH"))
+    {
+      if (!app->app_local->card_product)
+        app->app_local->card_product = CARD_PRODUCT_GENUA;
+    }
+
   /* Read the ODF so that we know the location of all directory
      files. */
   /* Fixme: We might need to get a non-standard ODF FID from TokenInfo. */
@@ -4202,6 +4284,27 @@ readcert_by_cdf (app_t app, cdf_object_t cdf,
       return 0;
     }
 
+  if (DBG_CARD)
+    {
+      log_info ("p15: Reading CDF: id=");
+      for (i=0; i < cdf->objidlen; i++)
+        log_printf ("%02X", cdf->objid[i]);
+      if (cdf->label)
+        log_printf (" (%s)", cdf->label);
+      log_info ("p15:             path=");
+      for (i=0; i < cdf->pathlen; i++)
+        log_printf ("%s%04hX", i?"/":"", cdf->path[i]);
+      if (cdf->have_off)
+        log_printf ("[%lu/%lu]", cdf->off, cdf->len);
+      if (cdf->authid)
+        {
+          log_printf (" authid=");
+          for (i=0; i < cdf->authidlen; i++)
+            log_printf ("%02X", cdf->authid[i]);
+        }
+      log_printf ("\n");
+    }
+
   /* Read the entire file.  fixme: This could be optimized by first
      reading the header to figure out how long the certificate
      actually is. */
@@ -4209,8 +4312,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 || !cdf->len)
+    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)
@@ -4892,7 +4999,18 @@ any_control_or_space (const char *string)
 {
   const unsigned char *s;
 
-  for (s = string; *string; string++)
+  for (s = string; *s; s++)
+    if (*s <= 0x20 || *s >= 0x7f)
+      return 1;
+  return 0;
+}
+
+static int
+any_control_or_space_mem (const void *buffer, size_t buflen)
+{
+  const unsigned char *s;
+
+  for (s = buffer; buflen; s++, buflen--)
     if (*s <= 0x20 || *s >= 0x7f)
       return 1;
   return 0;
@@ -4905,11 +5023,14 @@ static char *
 get_dispserialno (app_t app, prkdf_object_t prkdf)
 {
   char *serial;
+  const unsigned char *s;
+  int i;
   size_t n;
 
   /* We prefer the SerialNumber RDN from the Subject-DN but we don't
    * use it if it features a percent sign (special character in pin
-   * prompts) or has any control character.  */
+   * prompts) or has any control character.  For some cards we use a
+   * different strategy.  */
   if (app->app_local->card_product == CARD_PRODUCT_RSCS)
     {
       /* We use only the right 8 hex digits.  */
@@ -4917,6 +5038,28 @@ get_dispserialno (app_t app, prkdf_object_t prkdf)
       if (serial && (n=strlen (serial)) > 8)
         memmove (serial, serial + n - 8, 9);
     }
+  else if (IS_CARDOS_5 (app) && app->app_local->manufacturer_id
+           && !ascii_strcasecmp (app->app_local->manufacturer_id,
+                                 "Technology Nexus")
+           && app->serialno && app->serialnolen == 4+9
+           && !memcmp (app->serialno, "\xff\x00\x00\xff", 4)
+           && !any_control_or_space_mem (app->serialno + 4, 9))
+    {
+      /* Sample: ff0000ff354830313232363537 -> "5H01 2265 7" */
+      serial = xtrymalloc (9+2+1);
+      if (serial)
+        {
+          s = app->serialno + 4;
+          for (i=0; i < 4; i++)
+            serial[i] = *s++;
+          serial[i++] = ' ';
+          for (; i < 9; i++)
+            serial[i] = *s++;
+          serial[i++] = ' ';
+          serial[i++] = *s;
+          serial[i] = 0;
+        }
+    }
   else if (prkdf && prkdf->serial_number && *prkdf->serial_number
       && !strchr (prkdf->serial_number, '%')
       && !any_control_or_space (prkdf->serial_number))
@@ -4927,6 +5070,7 @@ get_dispserialno (app_t app, prkdf_object_t prkdf)
     {
       serial = app_get_serialno (app);
     }
+
   return serial;
 }
 
@@ -4938,11 +5082,28 @@ make_pin_prompt (app_t app, int remaining, const char *firstline,
                  prkdf_object_t prkdf)
 {
   char *serial, *tmpbuf, *result;
-  const char *holder;
+  const char *holder = NULL;
 
   serial = get_dispserialno (app, prkdf);
 
-  if (prkdf && prkdf->common_name)
+  if (app->app_local->card_product == CARD_PRODUCT_GENUA)
+    {
+      /* The label of the first non SO-PIN is used for the holder.  */
+      aodf_object_t aodf;
+
+      for (aodf = app->app_local->auth_object_info; aodf; aodf = aodf->next)
+        if (aodf->auth_type == AUTH_TYPE_PIN
+            && !aodf->pinflags.so_pin
+            && aodf->label)
+          {
+            holder = aodf->label;
+            break;
+          }
+    }
+
+  if (holder)
+    ;
+  else if (prkdf && prkdf->common_name)
     holder = prkdf->common_name;
   else if (app->app_local->token_label)
     holder = app->app_local->token_label;
@@ -5022,8 +5183,8 @@ verify_pin (app_t app,
     {
       /* We know that this card supports a verify status check.  Note
        * that in contrast to PIV cards ISO7816_VERIFY_NOT_NEEDED is
-       * not supported.  Noet that we don't use the pin_verified cache
-       * status because that is not as reliable than to ask the card
+       * not supported.  We also don't use the pin_verified cache
+       * status because that is not as reliable as to ask the card
        * about its state.  */
       if (prkdf)  /* Clear the cache which we don't use.  */
         prkdf->pin_verified = 0;
@@ -5504,7 +5665,7 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
       goto leave;
     }
 
-  if (prkdf->keyalgo == GCRY_PK_RSA && prkdf->keynbits > 2048)
+  if (prkdf->keyalgo == GCRY_PK_RSA && prkdf->keynbits >= 2048)
     {
       exmode = 1;
       le_value = prkdf->keynbits / 8;
@@ -5695,7 +5856,7 @@ do_decipher (app_t app, ctrl_t ctrl, const char *keyidstr,
 
   exmode = le_value = 0;
   padind = 0;
-  if (prkdf->keyalgo == GCRY_PK_RSA && prkdf->keynbits > 2048)
+  if (prkdf->keyalgo == GCRY_PK_RSA && prkdf->keynbits >= 2048)
     {
       exmode = 1;   /* Extended length w/o a limit.  */
       le_value = prkdf->keynbits / 8;
@@ -6040,7 +6201,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;
 
@@ -6057,6 +6223,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/ccid-driver.c b/scd/ccid-driver.c
index 919f685..44c183a 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -111,6 +111,10 @@
 /* CCID command timeout.  */
 #define CCID_CMD_TIMEOUT (5*1000)
 
+/* Number of supported devices.  See MAX_READER in apdu.c. */
+#define CCID_MAX_DEVICE 4
+
+
 /* Depending on how this source is used we either define our error
    output to go to stderr or to the GnuPG based logging functions.  We
    use the latter when GNUPG_MAJOR_VERSION or GNUPG_SCD_MAIN_HEADER
@@ -261,6 +265,19 @@ struct ccid_driver_s
 };
 
 
+/* Object to keep infos about found ccid devices.  */
+struct ccid_dev_table {
+  int n;                        /* Index to ccid_usb_dev_list */
+  int interface_number;
+  int setting_number;
+  unsigned char *ifcdesc_extra;
+  int ep_bulk_out;
+  int ep_bulk_in;
+  int ep_intr;
+  size_t ifcdesc_extra_len;
+};
+
+
 static int initialized_usb; /* Tracks whether USB has been initialized. */
 static int debug_level;     /* Flag to control the debug output.
                                0 = No debugging
@@ -270,6 +287,10 @@ static int debug_level;     /* Flag to control the debug output.
                               */
 static int ccid_usb_thread_is_alive;
 
+static libusb_device **ccid_usb_dev_list;
+static struct ccid_dev_table ccid_dev_table[CCID_MAX_DEVICE];
+
+
 
 static unsigned int compute_edc (const unsigned char *data, size_t datalen,
                                  int use_crc);
@@ -1323,22 +1344,6 @@ ccid_vendor_specific_pinpad_setup (ccid_driver_t handle)
 }
 
 
-#define MAX_DEVICE 4 /* See MAX_READER in apdu.c.  */
-
-struct ccid_dev_table {
-  int n;                        /* Index to ccid_usb_dev_list */
-  int interface_number;
-  int setting_number;
-  unsigned char *ifcdesc_extra;
-  int ep_bulk_out;
-  int ep_bulk_in;
-  int ep_intr;
-  size_t ifcdesc_extra_len;
-};
-
-static libusb_device **ccid_usb_dev_list;
-static struct ccid_dev_table ccid_dev_table[MAX_DEVICE];
-
 gpg_error_t
 ccid_dev_scan (int *idx_max_p, void **t_p)
 {
@@ -1423,7 +1428,7 @@ ccid_dev_scan (int *idx_max_p, void **t_p)
                 ccid_dev_table[idx].ep_intr = find_endpoint (ifcdesc, 2);
 
                 idx++;
-                if (idx >= MAX_DEVICE)
+                if (idx >= CCID_MAX_DEVICE)
                   {
                     libusb_free_config_descriptor (config);
                     err = 0;
@@ -1441,15 +1446,15 @@ ccid_dev_scan (int *idx_max_p, void **t_p)
     {
       for (i = 0; i < idx; i++)
         {
-          free (ccid_dev_table[idx].ifcdesc_extra);
-          ccid_dev_table[idx].n = 0;
-          ccid_dev_table[idx].interface_number = 0;
-          ccid_dev_table[idx].setting_number = 0;
-          ccid_dev_table[idx].ifcdesc_extra = NULL;
-          ccid_dev_table[idx].ifcdesc_extra_len = 0;
-          ccid_dev_table[idx].ep_bulk_out = 0;
-          ccid_dev_table[idx].ep_bulk_in = 0;
-          ccid_dev_table[idx].ep_intr = 0;
+          free (ccid_dev_table[i].ifcdesc_extra);
+          ccid_dev_table[i].n = 0;
+          ccid_dev_table[i].interface_number = 0;
+          ccid_dev_table[i].setting_number = 0;
+          ccid_dev_table[i].ifcdesc_extra = NULL;
+          ccid_dev_table[i].ifcdesc_extra_len = 0;
+          ccid_dev_table[i].ep_bulk_out = 0;
+          ccid_dev_table[i].ep_bulk_in = 0;
+          ccid_dev_table[i].ep_intr = 0;
         }
       libusb_free_device_list (ccid_usb_dev_list, 1);
       ccid_usb_dev_list = NULL;
diff --git a/scd/command.c b/scd/command.c
index fab6586..925fd75 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -698,7 +698,9 @@ pin_cb (void *opaque, const char *info, char **retstr)
 
   /* Fixme: Write an inquire function which returns the result in
      secure memory and check all further handling of the PIN. */
+  assuan_begin_confidential (ctx);
   rc = assuan_inquire (ctx, command, &value, &valuelen, MAXLEN_PIN);
+  assuan_end_confidential (ctx);
   xfree (command);
   if (rc)
     return rc;
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 5491556..b62f5b6 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -1,6 +1,7 @@
 /* scdaemon.c  -  The GnuPG Smartcard Daemon
- * Copyright (C) 2001-2002, 2004-2005, 2007-2009 Free Software Foundation, Inc.
- * Copyright (C) 2001-2002, 2004-2005, 2007-2014 Werner Koch
+ * Copyright (C) 2001-2002, 2004-2005, 2007-2020 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2002, 2004-2005, 2007-2019 Werner Koch
+ * Copyright (C) 2020 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -112,17 +113,24 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
   ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
 
-  ARGPARSE_group (301, N_("@Options:\n ")),
+  ARGPARSE_header (NULL, N_("Options used for startup")),
 
   ARGPARSE_s_n (oServer,"server", N_("run in server mode (foreground)")),
   ARGPARSE_s_n (oMultiServer, "multi-server",
                 N_("run in multi server mode (foreground)")),
   ARGPARSE_s_n (oDaemon, "daemon", N_("run in daemon mode (background)")),
-  ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
-  ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")),
+  ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")),
   ARGPARSE_s_n (oSh,    "sh", N_("sh-style command output")),
   ARGPARSE_s_n (oCsh,   "csh", N_("csh-style command output")),
+  ARGPARSE_s_s (oHomedir,    "homedir",      "@"),
   ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
+  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
+
+
+  ARGPARSE_header ("Monitor", N_("Options controlling the diagnostic output")),
+
+  ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
+  ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")),
   ARGPARSE_s_s (oDebug, "debug", "@"),
   ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
   ARGPARSE_s_s (oDebugLevel, "debug-level" ,
@@ -132,8 +140,12 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oDebugCCIDDriver, "debug-ccid-driver", "@"),
   ARGPARSE_s_n (oDebugLogTid, "debug-log-tid", "@"),
   ARGPARSE_p_u (oDebugAssuanLogCats, "debug-assuan-log-cats", "@"),
-  ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")),
   ARGPARSE_s_s (oLogFile,  "log-file", N_("|FILE|write a log to FILE")),
+
+
+  ARGPARSE_header ("Configuration",
+                   N_("Options controlling the configuration")),
+
   ARGPARSE_s_s (oReaderPort, "reader-port",
                 N_("|N|connect to reader at port N")),
   ARGPARSE_s_s (octapiDriver, "ctapi-driver",
@@ -154,16 +166,17 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oDisablePinpad, "disable-pinpad",
                 N_("do not use a reader's pinpad")),
   ARGPARSE_ignore (300, "disable-keypad"),
+  ARGPARSE_s_n (oEnablePinpadVarlen, "enable-pinpad-varlen",
+                N_("use variable length input for pinpad")),
+  ARGPARSE_s_s (oDisableApplication, "disable-application", "@"),
+  ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
+
+
+  ARGPARSE_header("Security", N_("Options controlling the security")),
 
   ARGPARSE_s_n (oAllowAdmin, "allow-admin", "@"),
   ARGPARSE_s_n (oDenyAdmin, "deny-admin",
                 N_("deny the use of admin card commands")),
-  ARGPARSE_s_s (oDisableApplication, "disable-application", "@"),
-  ARGPARSE_s_n (oEnablePinpadVarlen, "enable-pinpad-varlen",
-                N_("use variable length input for pinpad")),
-  ARGPARSE_s_s (oHomedir,    "homedir",      "@"),
-  ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
-  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
 
   /* Stubs for options which are implemented by 2.3 or later.  */
   ARGPARSE_s_s (oNoop, "application-priority", "@"),
@@ -182,6 +195,7 @@ static struct debug_flags_s debug_flags [] =
     { DBG_MEMSTAT_VALUE, "memstat" },
     { DBG_HASHING_VALUE, "hashing" },
     { DBG_IPC_VALUE    , "ipc"     },
+    { DBG_CARD_VALUE   , "card"    },
     { DBG_CARD_IO_VALUE, "cardio"  },
     { DBG_READER_VALUE , "reader"  },
     { 0, NULL }
diff --git a/scd/scdaemon.h b/scd/scdaemon.h
index 3ba1b9a..bb7c1b0 100644
--- a/scd/scdaemon.h
+++ b/scd/scdaemon.h
@@ -71,12 +71,13 @@ struct
 
 #define DBG_MPI_VALUE	  2	/* debug mpi details */
 #define DBG_CRYPTO_VALUE  4	/* debug low level crypto */
+#define DBG_CARD_VALUE    16    /* debug card info  */
 #define DBG_MEMORY_VALUE  32	/* debug memory allocation stuff */
 #define DBG_CACHE_VALUE   64	/* debug the caching */
 #define DBG_MEMSTAT_VALUE 128	/* show memory statistics */
 #define DBG_HASHING_VALUE 512	/* debug hashing operations */
 #define DBG_IPC_VALUE     1024
-#define DBG_CARD_IO_VALUE 2048
+#define DBG_CARD_IO_VALUE 2048  /* debug card I/O (e.g. APDUs).  */
 #define DBG_READER_VALUE  4096  /* Trace reader related functions.  */
 
 #define DBG_CRYPTO  (opt.debug & DBG_CRYPTO_VALUE)
@@ -84,6 +85,7 @@ struct
 #define DBG_CACHE   (opt.debug & DBG_CACHE_VALUE)
 #define DBG_HASHING (opt.debug & DBG_HASHING_VALUE)
 #define DBG_IPC     (opt.debug & DBG_IPC_VALUE)
+#define DBG_CARD    (opt.debug & DBG_CARD_VALUE)
 #define DBG_CARD_IO (opt.debug & DBG_CARD_IO_VALUE)
 #define DBG_READER  (opt.debug & DBG_READER_VALUE)
 
diff --git a/sm/Makefile.in b/sm/Makefile.in
index 9dd355e..286b652 100644
--- a/sm/Makefile.in
+++ b/sm/Makefile.in
@@ -301,6 +301,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/sm/call-agent.c b/sm/call-agent.c
index a5b17e9..0c271d9 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -989,6 +989,8 @@ learn_cb (void *opaque, const void *buffer, size_t length)
   char *buf;
   ksba_cert_t cert;
   int rc;
+  char *string, *p, *pend;
+  strlist_t sl;
 
   if (parm->error)
     return 0;
@@ -1025,6 +1027,35 @@ learn_cb (void *opaque, const void *buffer, size_t length)
       return 0;
     }
 
+  /* Ignore certificates matching certain extended usage flags.  */
+  rc = ksba_cert_get_ext_key_usages (cert, &string);
+  if (!rc)
+    {
+      p = string;
+      while (p && (pend=strchr (p, ':')))
+        {
+          *pend++ = 0;
+          for (sl=opt.ignore_cert_with_oid;
+               sl && strcmp (sl->d, p); sl = sl->next)
+            ;
+          if (sl)
+            {
+              if (opt.verbose)
+                log_info ("certificate ignored due to OID %s\n", sl->d);
+              goto leave;
+            }
+          p = pend;
+          if ((p = strchr (p, '\n')))
+            p++;
+        }
+    }
+  else if (gpg_err_code (rc) != GPG_ERR_NO_DATA)
+    log_error (_("error getting key usage information: %s\n"),
+               gpg_strerror (rc));
+  xfree (string);
+  string = NULL;
+
+
   /* We do not store a certifciate with missing issuers as ephemeral
      because we can assume that the --learn-card command has been used
      on purpose.  */
@@ -1045,6 +1076,9 @@ learn_cb (void *opaque, const void *buffer, size_t length)
         }
     }
 
+ leave:
+  xfree (string);
+  string = NULL;
   ksba_cert_release (cert);
   init_membuf (parm->data, 4096);
   return 0;
diff --git a/sm/certlist.c b/sm/certlist.c
index c3e4e82..b1ae58c 100644
--- a/sm/certlist.c
+++ b/sm/certlist.c
@@ -52,9 +52,11 @@ cert_usage_p (ksba_cert_t cert, int mode, int silent)
 {
   gpg_error_t err;
   unsigned int use;
+  unsigned int encr_bits, sign_bits;
   char *extkeyusages;
   int have_ocsp_signing = 0;
 
+
   err = ksba_cert_get_ext_key_usages (cert, &extkeyusages);
   if (gpg_err_code (err) == GPG_ERR_NO_DATA)
     err = 0; /* no policy given */
@@ -158,10 +160,13 @@ cert_usage_p (ksba_cert_t cert, int mode, int silent)
       return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
     }
 
-  if ((use & ((mode&1)?
-              (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT):
-              (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION)))
-      )
+  encr_bits = (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT);
+  if ((opt.compat_flags & COMPAT_ALLOW_KA_TO_ENCR))
+    encr_bits |= KSBA_KEYUSAGE_KEY_AGREEMENT;
+
+  sign_bits = (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION);
+
+  if ((use & ((mode&1)? encr_bits : sign_bits)))
     return 0;
 
   if (!silent)
diff --git a/sm/decrypt.c b/sm/decrypt.c
index 38aa832..2aa716f 100644
--- a/sm/decrypt.c
+++ b/sm/decrypt.c
@@ -1029,7 +1029,13 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
                           && gnupg_gcrypt_is_compliant (CO_DE_VS))
                         gpgsm_status (ctrl, STATUS_DECRYPTION_COMPLIANCE_MODE,
                                       gnupg_status_compliance_flag (CO_DE_VS));
-
+                      else if (opt.require_compliance
+                               && opt.compliance == CO_DE_VS)
+                        {
+                          log_error (_("operation forced to fail due to"
+                                       " unfulfilled compliance rules\n"));
+                          gpgsm_errors_seen = 1;
+                        }
                     }
                   audit_log_ok (ctrl->audit, AUDIT_RECP_RESULT, rc);
                 }
diff --git a/sm/encrypt.c b/sm/encrypt.c
index 37cfe92..587b568 100644
--- a/sm/encrypt.c
+++ b/sm/encrypt.c
@@ -535,6 +535,15 @@ gpgsm_encrypt (ctrl_t ctrl, certlist_t recplist, int data_fd, estream_t out_fp)
   if (compliant && gnupg_gcrypt_is_compliant (CO_DE_VS))
     gpgsm_status (ctrl, STATUS_ENCRYPTION_COMPLIANCE_MODE,
                   gnupg_status_compliance_flag (CO_DE_VS));
+  else if (opt.require_compliance
+           && opt.compliance == CO_DE_VS)
+    {
+      log_error (_("operation forced to fail due to"
+                   " unfulfilled compliance rules\n"));
+      gpgsm_errors_seen = 1;
+      rc = gpg_error (GPG_ERR_FORBIDDEN);
+      goto leave;
+    }
 
   /* Main control loop for encryption. */
   recpno = 0;
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 4af639f..2716890 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -188,6 +188,7 @@ enum cmd_and_opt_values {
   oSkipVerify,
   oValidationModel,
   oKeyServer,
+  oKeyServer_deprecated,
   oEncryptTo,
   oNoEncryptTo,
   oLoggerFD,
@@ -197,6 +198,9 @@ enum cmd_and_opt_values {
   oNoRandomSeedFile,
   oNoCommonCertsImport,
   oIgnoreCertExtension,
+  oIgnoreCertWithOID,
+  oRequireCompliance,
+  oCompatibilityFlags,
   oNoAutostart
  };
 
@@ -251,147 +255,107 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_c (aDumpSecretKeys, "dump-secret-keys", "@"),
   ARGPARSE_c (aKeydbClearSomeCertFlags, "keydb-clear-some-cert-flags", "@"),
 
-  ARGPARSE_group (301, N_("@\nOptions:\n ")),
 
-  ARGPARSE_s_n (oArmor, "armor", N_("create ascii armored output")),
-  ARGPARSE_s_n (oArmor, "armour", "@"),
-  ARGPARSE_s_n (oBase64, "base64", N_("create base-64 encoded output")),
-
-  ARGPARSE_s_s (oP12Charset, "p12-charset", "@"),
+  ARGPARSE_header ("Monitor", N_("Options controlling the diagnostic output")),
 
-  ARGPARSE_s_i (oPassphraseFD,    "passphrase-fd", "@"),
-  ARGPARSE_s_s (oPinentryMode,    "pinentry-mode", "@"),
-  ARGPARSE_s_s (oRequestOrigin,   "request-origin", "@"),
+  ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
+  ARGPARSE_s_n (oNoVerbose, "no-verbose", "@"),
+  ARGPARSE_s_n (oQuiet,	"quiet",  N_("be somewhat more quiet")),
+  ARGPARSE_s_n (oNoTTY, "no-tty", N_("don't use the terminal at all")),
+  ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
+  ARGPARSE_s_s (oDebug, "debug", "@"),
+  ARGPARSE_s_s (oDebugLevel, "debug-level",
+                N_("|LEVEL|set the debugging level to LEVEL")),
+  ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
+  ARGPARSE_s_n (oDebugNone, "debug-none", "@"),
+  ARGPARSE_s_i (oDebugWait, "debug-wait", "@"),
+  ARGPARSE_s_n (oDebugAllowCoreDump, "debug-allow-core-dump", "@"),
+  ARGPARSE_s_n (oDebugNoChainValidation, "debug-no-chain-validation", "@"),
+  ARGPARSE_s_n (oDebugIgnoreExpiration,  "debug-ignore-expiration", "@"),
+  ARGPARSE_s_s (oLogFile, "log-file",
+                N_("|FILE|write server mode logs to FILE")),
+  ARGPARSE_s_n (oNoLogFile, "no-log-file", "@"),
+  ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
+  ARGPARSE_s_n (oNoSecmemWarn, "no-secmem-warning", "@"),
 
-  ARGPARSE_s_n (oAssumeArmor, "assume-armor",
-                N_("assume input is in PEM format")),
-  ARGPARSE_s_n (oAssumeBase64, "assume-base64",
-                N_("assume input is in base-64 format")),
-  ARGPARSE_s_n (oAssumeBinary, "assume-binary",
-                N_("assume input is in binary format")),
 
-  ARGPARSE_s_s (oRecipient, "recipient", N_("|USER-ID|encrypt for USER-ID")),
+  ARGPARSE_header ("Configuration",
+                   N_("Options controlling the configuration")),
 
+  ARGPARSE_s_s (oHomedir, "homedir", "@"),
+  ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
   ARGPARSE_s_n (oPreferSystemDirmngr,"prefer-system-dirmngr", "@"),
-
-  ARGPARSE_s_n (oDisableCRLChecks, "disable-crl-checks",
-                N_("never consult a CRL")),
-  ARGPARSE_s_n (oEnableCRLChecks, "enable-crl-checks", "@"),
-  ARGPARSE_s_n (oDisableTrustedCertCRLCheck,
-                "disable-trusted-cert-crl-check", "@"),
-  ARGPARSE_s_n (oEnableTrustedCertCRLCheck,
-                "enable-trusted-cert-crl-check", "@"),
-
-  ARGPARSE_s_n (oForceCRLRefresh, "force-crl-refresh", "@"),
-
-  ARGPARSE_s_n (oDisableOCSP, "disable-ocsp", "@"),
-  ARGPARSE_s_n (oEnableOCSP,  "enable-ocsp", N_("check validity using OCSP")),
-
   ARGPARSE_s_s (oValidationModel, "validation-model", "@"),
-
   ARGPARSE_s_i (oIncludeCerts, "include-certs",
                 N_("|N|number of certificates to include") ),
-
   ARGPARSE_s_s (oPolicyFile, "policy-file",
                 N_("|FILE|take policy information from FILE")),
+  ARGPARSE_s_s (oCompliance, "compliance",   "@"),
+  ARGPARSE_p_u (oMinRSALength, "min-rsa-length", "@"),
+  ARGPARSE_s_n (oNoCommonCertsImport, "no-common-certs-import", "@"),
+  ARGPARSE_s_s (oIgnoreCertExtension, "ignore-cert-extension", "@"),
+  ARGPARSE_s_s (oIgnoreCertWithOID, "ignore-cert-with-oid", "@"),
+  ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"),
+  ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
+  ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"),
+  ARGPARSE_s_s (oProtectToolProgram, "protect-tool-program", "@"),
 
-  ARGPARSE_s_n (oDisablePolicyChecks, "disable-policy-checks",
-                N_("do not check certificate policies")),
-  ARGPARSE_s_n (oEnablePolicyChecks, "enable-policy-checks", "@"),
 
-  ARGPARSE_s_n (oAutoIssuerKeyRetrieve, "auto-issuer-key-retrieve",
-                N_("fetch missing issuer certificates")),
+  ARGPARSE_header ("Input", N_("Options controlling the input")),
 
-  ARGPARSE_s_s (oEncryptTo, "encrypt-to", "@"),
-  ARGPARSE_s_n (oNoEncryptTo, "no-encrypt-to", "@"),
+  ARGPARSE_s_n (oAssumeArmor, "assume-armor",
+                N_("assume input is in PEM format")),
+  ARGPARSE_s_n (oAssumeBase64, "assume-base64",
+                N_("assume input is in base-64 format")),
+  ARGPARSE_s_n (oAssumeBinary, "assume-binary",
+                N_("assume input is in binary format")),
 
-  ARGPARSE_s_s (oUser, "local-user",
-                N_("|USER-ID|use USER-ID to sign or decrypt")),
 
+  ARGPARSE_header ("Output", N_("Options controlling the output")),
+
+  ARGPARSE_s_n (oArmor, "armor", N_("create ascii armored output")),
+  ARGPARSE_s_n (oArmor, "armour", "@"),
+  ARGPARSE_s_n (oNoArmor, "no-armor", "@"),
+  ARGPARSE_s_n (oNoArmor, "no-armour", "@"),
+  ARGPARSE_s_n (oBase64, "base64", N_("create base-64 encoded output")),
   ARGPARSE_s_s (oOutput, "output", N_("|FILE|write output to FILE")),
-  ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
-  ARGPARSE_s_n (oQuiet,	"quiet",  N_("be somewhat more quiet")),
-  ARGPARSE_s_n (oNoTTY, "no-tty", N_("don't use the terminal at all")),
-  ARGPARSE_s_s (oLogFile, "log-file",
-                N_("|FILE|write a server mode log to FILE")),
-  ARGPARSE_s_n (oNoLogFile, "no-log-file", "@"),
-  ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
 
-  ARGPARSE_s_s (oAuditLog, "audit-log",
-                N_("|FILE|write an audit log to FILE")),
-  ARGPARSE_s_s (oHtmlAuditLog, "html-audit-log", "@"),
-  ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")),
-  ARGPARSE_s_n (oBatch, "batch", N_("batch mode: never ask")),
-  ARGPARSE_s_n (oAnswerYes, "yes", N_("assume yes on most questions")),
-  ARGPARSE_s_n (oAnswerNo,  "no",  N_("assume no on most questions")),
 
-  ARGPARSE_s_s (oKeyring, "keyring",
-                N_("|FILE|add keyring to the list of keyrings")),
+  ARGPARSE_header (NULL, N_("Options to specify keys")),
 
+  ARGPARSE_s_s (oRecipient, "recipient", N_("|USER-ID|encrypt for USER-ID")),
+  ARGPARSE_s_s (oUser, "local-user",
+                N_("|USER-ID|use USER-ID to sign or decrypt")),
   ARGPARSE_s_s (oDefaultKey, "default-key",
                 N_("|USER-ID|use USER-ID as default secret key")),
-
+  ARGPARSE_s_s (oEncryptTo, "encrypt-to",
+                N_("|NAME|encrypt to user ID NAME as well")),
+  ARGPARSE_s_n (oNoEncryptTo, "no-encrypt-to", "@"),
   /* Not yet used: */
   /*   ARGPARSE_s_s (oDefRecipient, "default-recipient", */
   /*                  N_("|NAME|use NAME as default recipient")), */
   /*   ARGPARSE_s_n (oDefRecipientSelf, "default-recipient-self", */
   /*                  N_("use the default key as default recipient")), */
   /*   ARGPARSE_s_n (oNoDefRecipient, "no-default-recipient", "@"), */
-
-  ARGPARSE_s_s (oKeyServer, "ldapserver",
-                N_("|SPEC|use this keyserver to lookup keys")),
+  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_deprecated, "ldapserver", "@"),
   ARGPARSE_s_s (oKeyServer, "keyserver", "@"),
 
-  ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
-
-  ARGPARSE_s_s (oDebug, "debug", "@"),
-  ARGPARSE_s_s (oDebugLevel, "debug-level",
-                N_("|LEVEL|set the debugging level to LEVEL")),
-  ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
-  ARGPARSE_s_n (oDebugNone, "debug-none", "@"),
-  ARGPARSE_s_i (oDebugWait, "debug-wait", "@"),
-  ARGPARSE_s_n (oDebugAllowCoreDump, "debug-allow-core-dump", "@"),
-  ARGPARSE_s_n (oDebugNoChainValidation, "debug-no-chain-validation", "@"),
-  ARGPARSE_s_n (oDebugIgnoreExpiration,  "debug-ignore-expiration", "@"),
-
-  ARGPARSE_s_i (oStatusFD, "status-fd",
-                N_("|FD|write status info to this FD")),
+  ARGPARSE_header ("ImportExport",
+                   N_("Options controlling key import and export")),
 
-  ARGPARSE_s_s (oCipherAlgo, "cipher-algo",
-                N_("|NAME|use cipher algorithm NAME")),
-  ARGPARSE_s_s (oDigestAlgo, "digest-algo",
-                N_("|NAME|use message digest algorithm NAME")),
-  ARGPARSE_s_s (oExtraDigestAlgo, "extra-digest-algo", "@"),
+  ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr",
+                N_("disable all access to the dirmngr")),
+  ARGPARSE_s_n (oAutoIssuerKeyRetrieve, "auto-issuer-key-retrieve",
+                N_("fetch missing issuer certificates")),
+  ARGPARSE_s_s (oP12Charset, "p12-charset",
+                N_("|NAME|use encoding NAME for PKCS#12 passphrases")),
 
 
-  ARGPARSE_group (302, N_(
-  "@\n(See the man page for a complete listing of all commands and options)\n"
-  )),
-
+  ARGPARSE_header ("Keylist", N_("Options controlling key listings")),
 
-  /* Hidden options. */
-  ARGPARSE_s_s (oCompliance, "compliance",   "@"),
-  ARGPARSE_s_n (oNoVerbose, "no-verbose", "@"),
-  ARGPARSE_s_n (oEnableSpecialFilenames, "enable-special-filenames", "@"),
-  ARGPARSE_s_n (oNoSecmemWarn, "no-secmem-warning", "@"),
-  ARGPARSE_s_n (oNoArmor, "no-armor", "@"),
-  ARGPARSE_s_n (oNoArmor, "no-armour", "@"),
-  ARGPARSE_s_n (oNoDefKeyring, "no-default-keyring", "@"),
-  ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
-  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
-  ARGPARSE_s_s (oHomedir, "homedir", "@"),
-  ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
-  ARGPARSE_s_s (oDisplay,    "display", "@"),
-  ARGPARSE_s_s (oTTYname,    "ttyname", "@"),
-  ARGPARSE_s_s (oTTYtype,    "ttytype", "@"),
-  ARGPARSE_s_s (oLCctype,    "lc-ctype", "@"),
-  ARGPARSE_s_s (oLCmessages, "lc-messages", "@"),
-  ARGPARSE_s_s (oXauthority, "xauthority", "@"),
-  ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"),
-  ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr", "@"),
-  ARGPARSE_s_s (oProtectToolProgram, "protect-tool-program", "@"),
-  ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
-  ARGPARSE_s_n (oNoBatch, "no-batch", "@"),
   ARGPARSE_s_n (oWithColons, "with-colons", "@"),
   ARGPARSE_s_n (oWithKeyData,"with-key-data", "@"),
   ARGPARSE_s_n (oWithValidation, "with-validation", "@"),
@@ -401,18 +365,68 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oWithFingerprint, "with-fingerprint", "@"),
   ARGPARSE_s_n (oWithKeygrip,     "with-keygrip", "@"),
   ARGPARSE_s_n (oWithSecret,      "with-secret", "@"),
+
+  ARGPARSE_header ("Security", N_("Options controlling the security")),
+
+  ARGPARSE_s_n (oDisableCRLChecks, "disable-crl-checks",
+                N_("never consult a CRL")),
+  ARGPARSE_s_n (oEnableCRLChecks, "enable-crl-checks", "@"),
+  ARGPARSE_s_n (oDisableTrustedCertCRLCheck,
+                "disable-trusted-cert-crl-check",
+                N_("do not check CRLs for root certificates")),
+  ARGPARSE_s_n (oEnableTrustedCertCRLCheck,
+                "enable-trusted-cert-crl-check", "@"),
+  ARGPARSE_s_n (oDisableOCSP, "disable-ocsp", "@"),
+  ARGPARSE_s_n (oEnableOCSP,  "enable-ocsp", N_("check validity using OCSP")),
+  ARGPARSE_s_n (oDisablePolicyChecks, "disable-policy-checks",
+                N_("do not check certificate policies")),
+  ARGPARSE_s_n (oEnablePolicyChecks, "enable-policy-checks", "@"),
+  ARGPARSE_s_s (oCipherAlgo, "cipher-algo",
+                N_("|NAME|use cipher algorithm NAME")),
+  ARGPARSE_s_s (oDigestAlgo, "digest-algo",
+                N_("|NAME|use message digest algorithm NAME")),
+  ARGPARSE_s_s (oExtraDigestAlgo, "extra-digest-algo", "@"),
   ARGPARSE_s_s (oDisableCipherAlgo,  "disable-cipher-algo", "@"),
   ARGPARSE_s_s (oDisablePubkeyAlgo,  "disable-pubkey-algo", "@"),
   ARGPARSE_s_n (oIgnoreTimeConflict, "ignore-time-conflict", "@"),
   ARGPARSE_s_n (oNoRandomSeedFile,  "no-random-seed-file", "@"),
+  ARGPARSE_s_n (oRequireCompliance, "require-compliance", "@"),
 
-  ARGPARSE_p_u (oMinRSALength, "min-rsa-length", "@"),
 
-  ARGPARSE_s_n (oNoCommonCertsImport, "no-common-certs-import", "@"),
-  ARGPARSE_s_s (oIgnoreCertExtension, "ignore-cert-extension", "@"),
-  ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"),
+  ARGPARSE_header (NULL, N_("Options for unattended use")),
+
+  ARGPARSE_s_n (oBatch, "batch", N_("batch mode: never ask")),
+  ARGPARSE_s_n (oNoBatch, "no-batch", "@"),
+  ARGPARSE_s_n (oAnswerYes, "yes", N_("assume yes on most questions")),
+  ARGPARSE_s_n (oAnswerNo,  "no",  N_("assume no on most questions")),
+  ARGPARSE_s_i (oStatusFD, "status-fd", N_("|FD|write status info to this FD")),
+  ARGPARSE_s_n (oEnableSpecialFilenames, "enable-special-filenames", "@"),
+  ARGPARSE_s_i (oPassphraseFD,    "passphrase-fd", "@"),
+  ARGPARSE_s_s (oPinentryMode,    "pinentry-mode", "@"),
+
+
+  ARGPARSE_header (NULL, N_("Other options")),
+
+  ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
+  ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
+  ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")),
+  ARGPARSE_s_s (oRequestOrigin,   "request-origin", "@"),
+  ARGPARSE_s_n (oForceCRLRefresh, "force-crl-refresh", "@"),
   ARGPARSE_s_n (oEnableIssuerBasedCRLCheck, "enable-issuer-based-crl-check",
                 "@"),
+  ARGPARSE_s_s (oAuditLog, "audit-log",
+                N_("|FILE|write an audit log to FILE")),
+  ARGPARSE_s_s (oHtmlAuditLog, "html-audit-log", "@"),
+  ARGPARSE_s_s (oDisplay,    "display", "@"),
+  ARGPARSE_s_s (oTTYname,    "ttyname", "@"),
+  ARGPARSE_s_s (oTTYtype,    "ttytype", "@"),
+  ARGPARSE_s_s (oLCctype,    "lc-ctype", "@"),
+  ARGPARSE_s_s (oLCmessages, "lc-messages", "@"),
+  ARGPARSE_s_s (oXauthority, "xauthority", "@"),
+  ARGPARSE_s_s (oCompatibilityFlags, "compatibility-flags", "@"),
+
+  ARGPARSE_header (NULL, ""),  /* Stop the header group.  */
+
 
   /* Command aliases.  */
   ARGPARSE_c (aListKeys, "list-key", "@"),
@@ -422,6 +436,10 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_c (aListChain, "check-sigs", "@"),
   ARGPARSE_c (aDeleteKey, "delete-key", "@"),
 
+  ARGPARSE_group (302, N_(
+  "@\n(See the man page for a complete listing of all commands and options)\n"
+  )),
+
   ARGPARSE_end ()
 };
 
@@ -441,6 +459,14 @@ static struct debug_flags_s debug_flags [] =
   };
 
 
+/* The list of compatibility flags.  */
+static struct compatibility_flags_s compatibility_flags [] =
+  {
+    { COMPAT_ALLOW_KA_TO_ENCR, "allow-ka-to-encr" },
+    { 0, NULL }
+  };
+
+
 /* Global variable to keep an error count. */
 int gpgsm_errors_seen = 0;
 
@@ -855,7 +881,7 @@ main ( int argc, char **argv)
   /* Please note that we may running SUID(ROOT), so be very CAREFUL
      when adding any stuff between here and the call to secmem_init()
      somewhere after the option parsing */
-  log_set_prefix (GPGSM_NAME, GPGRT_LOG_WITH_PREFIX);
+  log_set_prefix (GPGSM_NAME, GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY);
 
   /* Make sure that our subsystems are ready.  */
   i18n_init ();
@@ -1217,6 +1243,15 @@ main ( int argc, char **argv)
         case oDebugNoChainValidation: opt.no_chain_validation = 1; break;
         case oDebugIgnoreExpiration: opt.ignore_expiration = 1; break;
 
+        case oCompatibilityFlags:
+          if (parse_compatibility_flags (pargs.r.ret_str, &opt.compat_flags,
+                                         compatibility_flags))
+            {
+              pargs.r_opt = ARGPARSE_INVALID_ARG;
+              pargs.err = ARGPARSE_PRINT_ERROR;
+            }
+          break;
+
         case oStatusFD:
             ctrl.status_fd = translate_sys2libc_fd_int (pargs.r.ret_int, 1);
             break;
@@ -1362,10 +1397,18 @@ main ( int argc, char **argv)
           append_to_strlist (&opt.keyserver, pargs.r.ret_str);
 	  break;
 
+        case oKeyServer_deprecated:
+          obsolete_option (configname, pargs.lineno, "ldapserver");
+          break;
+
         case oIgnoreCertExtension:
           add_to_strlist (&opt.ignored_cert_extensions, pargs.r.ret_str);
           break;
 
+        case oIgnoreCertWithOID:
+          add_to_strlist (&opt.ignore_cert_with_oid, pargs.r.ret_str);
+          break;
+
         case oNoAutostart: opt.autostart = 0; break;
 
         case oCompliance:
@@ -1387,6 +1430,8 @@ main ( int argc, char **argv)
 
         case oMinRSALength: opt.min_rsa_length = pargs.r.ret_ulong; break;
 
+        case oRequireCompliance: opt.require_compliance = 1;  break;
+
         default:
           if (configname)
             pargs.err = ARGPARSE_PRINT_WARNING;
@@ -1483,6 +1528,8 @@ main ( int argc, char **argv)
   gcry_control (GCRYCTL_RESUME_SECMEM_WARN);
 
   set_debug ();
+  if (opt.verbose) /* Print the compatibility flags.  */
+    parse_compatibility_flags (NULL, &opt.compat_flags, compatibility_flags);
   gnupg_set_compliance_extra_info (opt.min_rsa_length);
 
   /* Although we always use gpgsm_exit, we better install a regualr
@@ -1701,39 +1748,20 @@ main ( int argc, char **argv)
     {
     case aGPGConfList:
       { /* List options and default values in the GPG Conf format.  */
-	char *config_filename_esc = percent_escape (opt.config_filename, NULL);
-
-        es_printf ("%s-%s.conf:%lu:\"%s\n",
-                   GPGCONF_NAME, GPGSM_NAME,
-                   GC_OPT_FLAG_DEFAULT, config_filename_esc);
-        xfree (config_filename_esc);
 
-        es_printf ("verbose:%lu:\n", GC_OPT_FLAG_NONE);
-	es_printf ("quiet:%lu:\n", GC_OPT_FLAG_NONE);
 	es_printf ("debug-level:%lu:\"none:\n", GC_OPT_FLAG_DEFAULT);
-	es_printf ("log-file:%lu:\n", GC_OPT_FLAG_NONE);
-        es_printf ("disable-crl-checks:%lu:\n", GC_OPT_FLAG_NONE);
-        es_printf ("enable-crl-checks:%lu:\n", GC_OPT_FLAG_NONE);
-        es_printf ("disable-trusted-cert-crl-check:%lu:\n", GC_OPT_FLAG_NONE);
-        es_printf ("enable-ocsp:%lu:\n", GC_OPT_FLAG_NONE);
         es_printf ("include-certs:%lu:%d:\n", GC_OPT_FLAG_DEFAULT,
                    DEFAULT_INCLUDE_CERTS);
-        es_printf ("disable-policy-checks:%lu:\n", GC_OPT_FLAG_NONE);
-        es_printf ("auto-issuer-key-retrieve:%lu:\n", GC_OPT_FLAG_NONE);
-        es_printf ("disable-dirmngr:%lu:\n", GC_OPT_FLAG_NONE);
         es_printf ("cipher-algo:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT,
                    DEFAULT_CIPHER_ALGO);
         es_printf ("p12-charset:%lu:\n", GC_OPT_FLAG_DEFAULT);
         es_printf ("default-key:%lu:\n", GC_OPT_FLAG_DEFAULT);
         es_printf ("encrypt-to:%lu:\n", GC_OPT_FLAG_DEFAULT);
-	es_printf ("keyserver:%lu:\n", GC_OPT_FLAG_NONE);
 
         /* The next one is an info only item and should match what
            proc_parameters actually implements.  */
         es_printf ("default_pubkey_algo:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT,
                    "RSA-3072");
-        es_printf ("compliance:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, "gnupg");
-
       }
       break;
     case aGPGConfTest:
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index 21c677e..53ef165 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -139,7 +139,19 @@ struct
      OID per string.  */
   strlist_t ignored_cert_extensions;
 
+  /* A list of OIDs which will be used to ignore certificates with
+   * sunch an OID during --learn-card.  */
+  strlist_t ignore_cert_with_oid;
+
+  /* The current compliance mode.  */
   enum gnupg_compliance_mode compliance;
+
+  /* Fail if an operation can't be done in the requested compliance
+   * mode.  */
+  int require_compliance;
+
+  /* Compatibility flags (COMPAT_FLAG_xxxx).  */
+  unsigned int compat_flags;
 } opt;
 
 /* Debug values and macros.  */
@@ -159,6 +171,18 @@ struct
 #define DBG_HASHING (opt.debug & DBG_HASHING_VALUE)
 #define DBG_IPC     (opt.debug & DBG_IPC_VALUE)
 
+
+/* Compatibility flags */
+/* Telesec RSA cards produced for NRW in 2022 came with only the
+ * keyAgreement bit set.  This flag allows there use for encryption
+ * anyway.  Example cert:
+ *    Issuer: /CN=DOI CA 10a/OU=DOI/O=PKI-1-Verwaltung/C=DE
+ * key usage: digitalSignature nonRepudiation keyAgreement
+ *  policies: 1.3.6.1.4.1.7924.1.1:N:
+ */
+#define COMPAT_ALLOW_KA_TO_ENCR   1
+
+
 /* Forward declaration for an object defined in server.c */
 struct server_local_s;
 
@@ -230,6 +254,8 @@ struct rootca_flags_s
 
 
 /*-- gpgsm.c --*/
+extern int gpgsm_errors_seen;
+
 void gpgsm_exit (int rc);
 void gpgsm_init_default_ctrl (struct server_control_s *ctrl);
 int  gpgsm_parse_validation_model (const char *model);
diff --git a/sm/import.c b/sm/import.c
index d7c898a..8a75a2b 100644
--- a/sm/import.c
+++ b/sm/import.c
@@ -777,7 +777,8 @@ parse_p12 (ctrl_t ctrl, ksba_reader_t reader, struct stats_s *stats)
     goto leave;
 
   kparms = p12_parse (p12buffer + p12bufoff, p12buflen - p12bufoff,
-                      passphrase, store_cert_cb, &store_cert_parm, &bad_pass);
+                      passphrase, store_cert_cb, &store_cert_parm,
+                      &bad_pass, NULL);
 
   xfree (passphrase);
   passphrase = NULL;
diff --git a/sm/keylist.c b/sm/keylist.c
index 4f2d009..2d51aa7 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -251,9 +251,11 @@ print_capabilities (ksba_cert_t cert, estream_t fp)
 {
   gpg_error_t err;
   unsigned int use;
+  unsigned int is_encr, is_sign, is_cert;
   size_t buflen;
   char buffer[1];
 
+
   err = ksba_cert_get_user_data (cert, "is_qualified",
                                  &buffer, sizeof (buffer), &buflen);
   if (!err && buflen)
@@ -285,17 +287,33 @@ print_capabilities (ksba_cert_t cert, estream_t fp)
       return;
     }
 
+  is_encr = is_sign = is_cert = 0;
+
   if ((use & (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT)))
-    es_putc ('e', fp);
+    is_encr = 1;
   if ((use & (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION)))
-    es_putc ('s', fp);
+    is_sign = 1;
   if ((use & KSBA_KEYUSAGE_KEY_CERT_SIGN))
+    is_cert = 1;
+
+  /* We need to returned the faked key usage to frontends so that they
+   * can select the right key.  Note that we don't do this for the
+   * human readable keyUsage.  */
+  if ((opt.compat_flags & COMPAT_ALLOW_KA_TO_ENCR)
+      && (use & KSBA_KEYUSAGE_KEY_AGREEMENT))
+    is_encr = 1;
+
+  if (is_encr)
+    es_putc ('e', fp);
+  if (is_sign)
+    es_putc ('s', fp);
+  if (is_cert)
     es_putc ('c', fp);
-  if ((use & (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT)))
+  if (is_encr)
     es_putc ('E', fp);
-  if ((use & (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION)))
+  if (is_sign)
     es_putc ('S', fp);
-  if ((use & KSBA_KEYUSAGE_KEY_CERT_SIGN))
+  if (is_cert)
     es_putc ('C', fp);
 }
 
diff --git a/sm/minip12.c b/sm/minip12.c
index 9096f0b..ad29fc2 100644
--- a/sm/minip12.c
+++ b/sm/minip12.c
@@ -1,6 +1,7 @@
 /* minip12.c - A minimal pkcs-12 implementation.
  * Copyright (C) 2002, 2003, 2004, 2006, 2011 Free Software Foundation, Inc.
  * Copyright (C) 2014 Werner Koch
+ * Copyright (C) 2022 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -16,6 +17,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+/* References:
+ * RFC-7292 - PKCS #12: Personal Information Exchange Syntax v1.1
+ * RFC-8351 - The PKCS #8 EncryptedPrivateKeyInfo Media Type
+ * RFC-5958 - Asymmetric Key Packages
+ * RFC-3447 - PKCS  #1: RSA Cryptography Specifications Version 2.1
+ * RFC-5915 - Elliptic Curve Private Key Structure
  */
 
 #ifdef HAVE_CONFIG_H
@@ -24,17 +34,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 #include <gcrypt.h>
 #include <errno.h>
 
-#ifdef TEST
-#include <sys/stat.h>
-#include <unistd.h>
-#endif
+#include <ksba.h>
 
+#include "../common/util.h"
 #include "../common/logging.h"
 #include "../common/utf8conv.h"
+#include "../common/tlv.h"
+#include "../common/openpgpdefs.h" /* Only for openpgp_curve_to_oid.  */
 #include "minip12.h"
 
 #ifndef DIM
@@ -42,48 +51,6 @@
 #endif
 
 
-enum
-{
-  UNIVERSAL = 0,
-  APPLICATION = 1,
-  ASNCONTEXT = 2,
-  PRIVATE = 3
-};
-
-
-enum
-{
-  TAG_NONE = 0,
-  TAG_BOOLEAN = 1,
-  TAG_INTEGER = 2,
-  TAG_BIT_STRING = 3,
-  TAG_OCTET_STRING = 4,
-  TAG_NULL = 5,
-  TAG_OBJECT_ID = 6,
-  TAG_OBJECT_DESCRIPTOR = 7,
-  TAG_EXTERNAL = 8,
-  TAG_REAL = 9,
-  TAG_ENUMERATED = 10,
-  TAG_EMBEDDED_PDV = 11,
-  TAG_UTF8_STRING = 12,
-  TAG_REALTIVE_OID = 13,
-  TAG_SEQUENCE = 16,
-  TAG_SET = 17,
-  TAG_NUMERIC_STRING = 18,
-  TAG_PRINTABLE_STRING = 19,
-  TAG_TELETEX_STRING = 20,
-  TAG_VIDEOTEX_STRING = 21,
-  TAG_IA5_STRING = 22,
-  TAG_UTC_TIME = 23,
-  TAG_GENERALIZED_TIME = 24,
-  TAG_GRAPHIC_STRING = 25,
-  TAG_VISIBLE_STRING = 26,
-  TAG_GENERAL_STRING = 27,
-  TAG_UNIVERSAL_STRING = 28,
-  TAG_CHARACTER_STRING = 29,
-  TAG_BMP_STRING = 30
-};
-
 
 static unsigned char const oid_data[9] = {
   0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07, 0x01 };
@@ -114,7 +81,8 @@ static unsigned char const oid_aes128_CBC[9] = {
 
 static unsigned char const oid_rsaEncryption[9] = {
   0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01 };
-
+static unsigned char const oid_pcPublicKey[7] = {
+  0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x02, 0x01 };
 
 static unsigned char const data_3desiter2048[30] = {
   0x30, 0x1C, 0x06, 0x0A, 0x2A, 0x86, 0x48, 0x86,
@@ -175,6 +143,26 @@ struct tag_info
   int ndef;              /* It is an indefinite length */
 };
 
+/* Parser communication object.  */
+struct p12_parse_ctx_s
+{
+  /* The callback for parsed certificates and its arg.  */
+  void (*certcb)(void*, const unsigned char*, size_t);
+  void *certcbarg;
+
+  /* The supplied parseword.  */
+  const char *password;
+
+  /* Set to true if the password was wrong.  */
+  int badpass;
+
+  /* Malloced name of the curve.  */
+  char *curve;
+
+  /* The private key as an MPI array.   */
+  gcry_mpi_t *privatekey;
+};
+
 
 static int opt_verbose;
 
@@ -186,6 +174,108 @@ p12_set_verbosity (int verbose)
 }
 
 
+/* static void */
+/* dump_tag_info (struct tag_info *ti) */
+/* { */
+/*   log_debug ("p12_parse: ti.class=%d tag=%lu len=%lu nhdr=%d %s%s\n", */
+/*              ti->class, ti->tag, ti->length, ti->nhdr, */
+/*              ti->is_constructed?" cons":"", */
+/*              ti->ndef?" ndef":""); */
+/* } */
+
+
+/* Wrapper around tlv_builder_add_ptr to add an OID.  When we
+ * eventually put the whole tlv_builder stuff into Libksba, we can add
+ * such a function there.  Right now we don't do this to avoid a
+ * dependency on Libksba.  Function return 1 on error.  */
+static int
+builder_add_oid (tlv_builder_t tb, int class, const char *oid)
+{
+  gpg_error_t err;
+  unsigned char *der;
+  size_t derlen;
+
+  err = ksba_oid_from_str (oid, &der, &derlen);
+  if (err)
+    {
+      log_error ("%s: error converting '%s' to DER: %s\n",
+                 __func__, oid, gpg_strerror (err));
+      return 1;
+    }
+
+  tlv_builder_add_val (tb, class, TAG_OBJECT_ID, der, derlen);
+  ksba_free (der);
+  return 0;
+}
+
+
+/* Wrapper around tlv_builder_add_ptr to add an MPI.  TAG may either
+ * be OCTET_STRING or BIT_STRING.  When we eventually put the whole
+ * tlv_builder stuff into Libksba, we can add such a function there.
+ * Right now we don't do this to avoid a dependency on Libksba.
+ * Function return 1 on error.  STRIP is a hack to remove the first
+ * octet from the value. */
+static int
+builder_add_mpi (tlv_builder_t tb, int class, int tag, gcry_mpi_t mpi,
+                 int strip)
+{
+  int returncode;
+  gpg_error_t err;
+  const unsigned char *s;
+  unsigned char *freethis = NULL;
+  unsigned char *freethis2 = NULL;
+  unsigned int nbits;
+  size_t n;
+
+  if (gcry_mpi_get_flag (mpi, GCRYMPI_FLAG_OPAQUE))
+    {
+      s = gcry_mpi_get_opaque (mpi, &nbits);
+      n = (nbits+7)/8;
+    }
+  else
+    {
+      err = gcry_mpi_aprint (GCRYMPI_FMT_USG, &freethis, &n, mpi);
+      if (err)
+        {
+          log_error ("%s: error converting MPI: %s\n",
+                     __func__, gpg_strerror (err));
+          returncode = 1;
+          goto leave;
+        }
+      s = freethis;
+    }
+
+  if (tag == TAG_BIT_STRING)
+    {
+      freethis2 = xtrymalloc_secure (n + 1);
+      if (!freethis2)
+        {
+          err = gpg_error_from_syserror ();
+          log_error ("%s: error converting MPI: %s\n",
+                     __func__, gpg_strerror (err));
+          returncode = 1;
+          goto leave;
+        }
+      freethis2[0] = 0;
+      memcpy (freethis2+1, s, n);
+      s = freethis2;
+      n++;
+    }
+
+  strip = !!strip;
+  if (strip && n < 2)
+    strip = 0;
+
+  tlv_builder_add_val (tb, class, tag, s+strip, n-strip);
+  returncode = 0;
+
+ leave:
+  xfree (freethis);
+  xfree (freethis2);
+  return returncode;
+}
+
+
 /* Parse the buffer at the address BUFFER which is of SIZE and return
    the tag and the length part from the TLV triplet.  Update BUFFER
    and SIZE on success.  Checks that the encoded length does not
@@ -257,7 +347,7 @@ parse_tag (unsigned char const **buffer, size_t *size, struct tag_info *ti)
       ti->length = len;
     }
 
-  if (ti->class == UNIVERSAL && !ti->tag)
+  if (ti->class == CLASS_UNIVERSAL && !ti->tag)
     ti->length = 0;
 
   if (ti->length > length)
@@ -304,11 +394,11 @@ cram_octet_string (const unsigned char *input, size_t *length,
   if (!output)
     goto bailout;
 
-  for (;;)
+  while (n)
     {
       if (parse_tag (&s, &n, &ti))
         goto bailout;
-      if (ti.class == UNIVERSAL && ti.tag == TAG_OCTET_STRING
+      if (ti.class == CLASS_UNIVERSAL && ti.tag == TAG_OCTET_STRING
           && !ti.ndef && !ti.is_constructed)
         {
           memcpy (d, s, ti.length);
@@ -316,7 +406,7 @@ cram_octet_string (const unsigned char *input, size_t *length,
           d += ti.length;
           n -= ti.length;
         }
-      else if (ti.class == UNIVERSAL && !ti.tag && !ti.is_constructed)
+      else if (ti.class == CLASS_UNIVERSAL && !ti.tag && !ti.is_constructed)
         break; /* Ready */
       else
         goto bailout;
@@ -442,7 +532,7 @@ set_key_iv (gcry_cipher_hd_t chd, char *salt, size_t saltlen, int iter,
   unsigned char keybuf[24];
   int rc;
 
-  assert (keybytes == 5 || keybytes == 24);
+  log_assert (keybytes == 5 || keybytes == 24);
   if (string_to_key (1, salt, saltlen, iter, pw, keybytes, keybuf))
     return -1;
   rc = gcry_cipher_setkey (chd, keybuf, keybytes);
@@ -539,7 +629,8 @@ crypt_block (unsigned char *buffer, size_t length, char *salt, size_t saltlen,
   if (rc)
     {
       wipememory (buffer, length);
-      log_error ( "en/de-crytion failed: %s\n", gpg_strerror (rc));
+      log_error ("%scrytion failed (%zu bytes): %s\n",
+                 encrypt?"en":"de", length, gpg_strerror (rc));
       goto leave;
     }
 
@@ -652,7 +743,7 @@ bag_decrypted_data_p (const void *plaintext, size_t length)
 
   /*   { */
   /* #  warning debug code is enabled */
-  /*     FILE *fp = fopen ("tmp-rc2-plain.der", "wb"); */
+  /*     FILE *fp = fopen ("tmp-minip12-plain-data.der", "wb"); */
   /*     if (!fp || fwrite (p, n, 1, fp) != 1) */
   /*       exit (2); */
   /*     fclose (fp); */
@@ -668,14 +759,11 @@ bag_decrypted_data_p (const void *plaintext, size_t length)
   return 1;
 }
 
-/* Note: If R_RESULT is passed as NULL, a key object as already be
-   processed and thus we need to skip it here. */
+
 static int
-parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
-                          int startoffset, size_t *r_consumed, const char *pw,
-                          void (*certcb)(void*, const unsigned char*, size_t),
-                          void *certcbarg, gcry_mpi_t **r_result,
-                          int *r_badpass)
+parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx,
+                          const unsigned char *buffer, size_t length,
+                          int startoffset, size_t *r_consumed)
 {
   struct tag_info ti;
   const unsigned char *p = buffer;
@@ -687,20 +775,16 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
   char iv[16];
   unsigned int iter;
   unsigned char *plain = NULL;
-  int bad_pass = 0;
   unsigned char *cram_buffer = NULL;
   size_t consumed = 0; /* Number of bytes consumed from the original buffer. */
   int is_3des = 0;
   int is_pbes2 = 0;
-  gcry_mpi_t *result = NULL;
-  int result_count;
+  int keyelem_count;
 
-  if (r_result)
-    *r_result = NULL;
   where = "start";
   if (parse_tag (&p, &n, &ti))
     goto bailout;
-  if (ti.class != ASNCONTEXT || ti.tag)
+  if (ti.class != CLASS_CONTEXT || ti.tag)
     goto bailout;
   if (parse_tag (&p, &n, &ti))
     goto bailout;
@@ -860,10 +944,10 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
     goto bailout;
 
   consumed = p - p_start;
-  if (ti.class == ASNCONTEXT && ti.tag == 0 && ti.is_constructed && ti.ndef)
+  if (ti.class == CLASS_CONTEXT && ti.tag == 0 && ti.is_constructed && ti.ndef)
     {
       /* Mozilla exported certs now come with single byte chunks of
-         octect strings.  (Mozilla Firefox 1.0.4).  Arghh. */
+         octet strings.  (Mozilla Firefox 1.0.4).  Arghh. */
       where = "cram-rc2or3des-ciphertext";
       cram_buffer = cram_octet_string ( p, &n, &consumed);
       if (!cram_buffer)
@@ -871,10 +955,23 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
       p = p_start = cram_buffer;
       if (r_consumed)
         *r_consumed = consumed;
-      r_consumed = NULL; /* Ugly hack to not update that value any further. */
+      r_consumed = NULL; /* Donot update that value on return. */
+      ti.length = n;
+    }
+  else if (ti.class == CLASS_CONTEXT && ti.tag == 0 && ti.is_constructed)
+    {
+      where = "octets-rc2or3des-ciphertext";
+      n = ti.length;
+      cram_buffer = cram_octet_string ( p, &n, &consumed);
+      if (!cram_buffer)
+        goto bailout;
+      p = p_start = cram_buffer;
+      if (r_consumed)
+        *r_consumed = consumed;
+      r_consumed = NULL; /* Do not update that value on return. */
       ti.length = n;
     }
-  else if (ti.class == ASNCONTEXT && ti.tag == 0 && ti.length )
+  else if (ti.class == CLASS_CONTEXT && ti.tag == 0 && ti.length )
     ;
   else
     goto bailout;
@@ -890,7 +987,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
       goto bailout;
     }
   decrypt_block (p, plain, ti.length, salt, saltlen, iter,
-                 iv, is_pbes2?16:0, pw,
+                 iv, is_pbes2?16:0, ctx->password,
                  is_pbes2 ? GCRY_CIPHER_AES128 :
                  is_3des  ? GCRY_CIPHER_3DES : GCRY_CIPHER_RFC2268_40,
                  bag_decrypted_data_p);
@@ -901,18 +998,18 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
   where = "outer.outer.seq";
   if (parse_tag (&p, &n, &ti))
     {
-      bad_pass = 1;
+      ctx->badpass = 1;
       goto bailout;
     }
   if (ti.class || ti.tag != TAG_SEQUENCE)
     {
-      bad_pass = 1;
+      ctx->badpass = 1;
       goto bailout;
     }
 
   if (parse_tag (&p, &n, &ti))
     {
-      bad_pass = 1;
+      ctx->badpass = 1;
       goto bailout;
     }
 
@@ -960,7 +1057,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
       where = "certbag.before.certheader";
       if (parse_tag (&p, &n, &ti))
         goto bailout;
-      if (ti.class != ASNCONTEXT || ti.tag)
+      if (ti.class != CLASS_CONTEXT || ti.tag)
         goto bailout;
       if (iscrlbag)
         {
@@ -968,7 +1065,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
           p += ti.length;
           n -= ti.length;
         }
-      else if (iskeybag && (result || !r_result))
+      else if (iskeybag && ctx->privatekey)
         {
           log_info ("one keyBag already processed; skipping this one\n");
           p += ti.length;
@@ -1018,16 +1115,17 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
             goto bailout;
           len = ti.length;
 
-          result = gcry_calloc (10, sizeof *result);
-          if (!result)
+          log_assert (!ctx->privatekey);
+          ctx->privatekey = gcry_calloc (10, sizeof *ctx->privatekey);
+          if (!ctx->privatekey)
             {
-              log_error ( "error allocating result array\n");
+              log_error ("error allocating private key element array\n");
               goto bailout;
             }
-          result_count = 0;
+          keyelem_count = 0;
 
           where = "reading.keybag.key-parameters";
-          for (result_count = 0; len && result_count < 9;)
+          for (keyelem_count = 0; len && keyelem_count < 9;)
             {
               if ( parse_tag (&p, &n, &ti)
                    || ti.class || ti.tag != TAG_INTEGER)
@@ -1038,13 +1136,14 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
               if (len < ti.length)
                 goto bailout;
               len -= ti.length;
-              if (!result_count && ti.length == 1 && !*p)
+              if (!keyelem_count && ti.length == 1 && !*p)
                 ; /* ignore the very first one if it is a 0 */
               else
                 {
                   int rc;
 
-                  rc = gcry_mpi_scan (result+result_count, GCRYMPI_FMT_USG, p,
+                  rc = gcry_mpi_scan (ctx->privatekey+keyelem_count,
+                                      GCRYMPI_FMT_USG, p,
                                       ti.length, NULL);
                   if (rc)
                     {
@@ -1052,7 +1151,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
                                  gpg_strerror (rc));
                       goto bailout;
                     }
-                  result_count++;
+                  keyelem_count++;
                 }
               p += ti.length;
               n -= ti.length;
@@ -1081,7 +1180,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
           where = "certbag.before.octetstring";
           if (parse_tag (&p, &n, &ti))
             goto bailout;
-          if (ti.class != ASNCONTEXT || ti.tag)
+          if (ti.class != CLASS_CONTEXT || ti.tag)
             goto bailout;
           if (parse_tag (&p, &n, &ti))
             goto bailout;
@@ -1089,8 +1188,8 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
             goto bailout;
 
           /* Return the certificate. */
-          if (certcb)
-            certcb (certcbarg, p, ti.length);
+          if (ctx->certcb)
+            ctx->certcb (ctx->certcbarg, p, ti.length);
 
           p += ti.length;
           n -= ti.length;
@@ -1129,32 +1228,21 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
     *r_consumed = consumed;
   gcry_free (plain);
   gcry_free (cram_buffer);
-  if (r_result)
-    *r_result = result;
   return 0;
 
  bailout:
-  if (result)
-    {
-      int i;
-
-      for (i=0; result[i]; i++)
-        gcry_mpi_release (result[i]);
-      gcry_free (result);
-    }
   if (r_consumed)
     *r_consumed = consumed;
   gcry_free (plain);
   gcry_free (cram_buffer);
   log_error ("encryptedData error at \"%s\", offset %u\n",
              where, (unsigned int)((p - p_start)+startoffset));
-  if (bad_pass)
+  if (ctx->badpass)
     {
       /* Note, that the following string might be used by other programs
          to check for a bad passphrase; it should therefore not be
          translated or changed. */
       log_error ("possibly bad passphrase given\n");
-      *r_badpass = 1;
     }
   return -1;
 }
@@ -1171,7 +1259,7 @@ bag_data_p (const void *plaintext, size_t length)
 
 /*   { */
 /* #  warning debug code is enabled */
-/*     FILE *fp = fopen ("tmp-3des-plain-key.der", "wb"); */
+/*     FILE *fp = fopen ("tmp-minip12-plain-key.der", "wb"); */
 /*     if (!fp || fwrite (p, n, 1, fp) != 1) */
 /*       exit (2); */
 /*     fclose (fp); */
@@ -1187,11 +1275,13 @@ bag_data_p (const void *plaintext, size_t length)
 }
 
 
-static gcry_mpi_t *
-parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
-                size_t *r_consumed, const char *pw)
+static gpg_error_t
+parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx,
+                        const unsigned char *buffer, size_t length,
+                        int startoffset,
+                        size_t *r_consumed)
 {
-  int rc;
+  gpg_error_t err = 0;
   struct tag_info ti;
   const unsigned char *p = buffer;
   const unsigned char *p_start = buffer;
@@ -1203,63 +1293,15 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
   unsigned int iter;
   int len;
   unsigned char *plain = NULL;
-  gcry_mpi_t *result = NULL;
-  int result_count, i;
   unsigned char *cram_buffer = NULL;
   size_t consumed = 0; /* Number of bytes consumed from the original buffer. */
   int is_pbes2 = 0;
+  int keyelem_count = 0;
 
-  where = "start";
-  if (parse_tag (&p, &n, &ti))
-    goto bailout;
-  if (ti.class != ASNCONTEXT || ti.tag)
-    goto bailout;
-  if (parse_tag (&p, &n, &ti))
-    goto bailout;
-  if (ti.class || ti.tag != TAG_OCTET_STRING)
-    goto bailout;
-
-  consumed = p - p_start;
-  if (ti.is_constructed && ti.ndef)
-    {
-      /* Mozilla exported certs now come with single byte chunks of
-         octect strings.  (Mozilla Firefox 1.0.4).  Arghh. */
-      where = "cram-data.outersegs";
-      cram_buffer = cram_octet_string ( p, &n, &consumed);
-      if (!cram_buffer)
-        goto bailout;
-      p = p_start = cram_buffer;
-      if (r_consumed)
-        *r_consumed = consumed;
-      r_consumed = NULL; /* Ugly hack to not update that value any further. */
-    }
-
-
-  where = "data.outerseqs";
-  if (parse_tag (&p, &n, &ti))
-    goto bailout;
-  if (ti.class || ti.tag != TAG_SEQUENCE)
-    goto bailout;
-  if (parse_tag (&p, &n, &ti))
-    goto bailout;
-  if (ti.class || ti.tag != TAG_SEQUENCE)
-    goto bailout;
-
-  where = "data.objectidentifier";
-  if (parse_tag (&p, &n, &ti))
-    goto bailout;
-  if (ti.class || ti.tag != TAG_OBJECT_ID
-      || ti.length != DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)
-      || memcmp (p, oid_pkcs_12_pkcs_8ShroudedKeyBag,
-                 DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)))
-    goto bailout;
-  p += DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag);
-  n -= DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag);
-
-  where = "shrouded,outerseqs";
+  where = "shrouded_key_bag";
   if (parse_tag (&p, &n, &ti))
     goto bailout;
-  if (ti.class != ASNCONTEXT || ti.tag)
+  if (ti.class != CLASS_CONTEXT || ti.tag)
     goto bailout;
   if (parse_tag (&p, &n, &ti))
     goto bailout;
@@ -1292,7 +1334,7 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
 
   if (is_pbes2)
     {
-      where = "pkcs5PBES2-params";
+      where = "shrouded_key_bag.pkcs5PBES2-params";
       if (parse_tag (&p, &n, &ti))
         goto bailout;
       if (ti.class || ti.tag != TAG_SEQUENCE)
@@ -1357,7 +1399,7 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
     }
   else
     {
-      where = "3des-params";
+      where = "shrouded_key_bag.3des-params";
       if (parse_tag (&p, &n, &ti))
         goto bailout;
       if (ti.class || ti.tag != TAG_SEQUENCE)
@@ -1383,7 +1425,7 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
         }
     }
 
-  where = "3desoraes-ciphertext";
+  where = "shrouded_key_bag.3desoraes-ciphertext";
   if (parse_tag (&p, &n, &ti))
     goto bailout;
   if (ti.class || ti.tag != TAG_OCTET_STRING || !ti.length )
@@ -1401,14 +1443,14 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
     }
   consumed += p - p_start + ti.length;
   decrypt_block (p, plain, ti.length, salt, saltlen, iter,
-                 iv, is_pbes2? 16:0, pw,
+                 iv, is_pbes2? 16:0, ctx->password,
                  is_pbes2? GCRY_CIPHER_AES128 : GCRY_CIPHER_3DES,
                  bag_data_p);
   n = ti.length;
   startoffset = 0;
   p_start = p = plain;
 
-  where = "decrypted-text";
+  where = "shrouded_key_bag.decrypted-text";
   if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_SEQUENCE)
     goto bailout;
   if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_INTEGER
@@ -1423,13 +1465,44 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
   if (len < ti.nhdr)
     goto bailout;
   len -= ti.nhdr;
-  if (ti.class || ti.tag != TAG_OBJECT_ID
-      || ti.length != DIM(oid_rsaEncryption)
-      || memcmp (p, oid_rsaEncryption,
-                 DIM(oid_rsaEncryption)))
+  if (ti.class || ti.tag != TAG_OBJECT_ID)
+    goto bailout;
+  /* gpgrt_log_printhex (p, ti.length, "OID:"); */
+  if (ti.length == DIM(oid_rsaEncryption)
+      && !memcmp (p, oid_rsaEncryption, DIM(oid_rsaEncryption)))
+    {
+      p += DIM (oid_rsaEncryption);
+      n -= DIM (oid_rsaEncryption);
+    }
+  else if (ti.length == DIM(oid_pcPublicKey)
+           && !memcmp (p, oid_pcPublicKey, DIM(oid_pcPublicKey)))
+    {
+      /* See RFC-5915 for the format.  */
+      p += DIM (oid_pcPublicKey);
+      n -= DIM (oid_pcPublicKey);
+      if (len < ti.length)
+        goto bailout;
+      len -= ti.length;
+      if (n < len)
+        goto bailout;
+      if (parse_tag (&p, &n, &ti))
+        goto bailout;
+      /* gpgrt_log_debug ("ti=%d/%lu len=%lu\n",ti.class,ti.tag,ti.length); */
+      if (len < ti.nhdr)
+        goto bailout;
+      len -= ti.nhdr;
+      if (ti.class || ti.tag != TAG_OBJECT_ID)
+        goto bailout;
+      ksba_free (ctx->curve);
+      ctx->curve = ksba_oid_to_str (p, ti.length);
+      if (!ctx->curve)
+        goto bailout;
+      /* log_debug ("OID of curve is: %s\n", curve); */
+      p += ti.length;
+      n -= ti.length;
+    }
+  else
     goto bailout;
-  p += DIM (oid_rsaEncryption);
-  n -= DIM (oid_rsaEncryption);
   if (len < ti.length)
     goto bailout;
   len -= ti.length;
@@ -1443,16 +1516,22 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
     goto bailout;
   len = ti.length;
 
-  result = gcry_calloc (10, sizeof *result);
-  if (!result)
+  if (ctx->privatekey)
     {
-      log_error ( "error allocating result array\n");
+      log_error ("a key has already been received\n");
       goto bailout;
     }
-  result_count = 0;
+  ctx->privatekey = gcry_calloc (10, sizeof *ctx->privatekey);
+  if (!ctx->privatekey)
+    {
 
-  where = "reading.key-parameters";
-  for (result_count=0; len && result_count < 9;)
+      log_error ("error allocating privatekey element array\n");
+      goto bailout;
+    }
+  keyelem_count = 0;
+
+  where = "shrouded_key_bag.reading.key-parameters";
+  if (ctx->curve)  /* ECC case.  */
     {
       if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_INTEGER)
         goto bailout;
@@ -1462,45 +1541,283 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
       if (len < ti.length)
         goto bailout;
       len -= ti.length;
-      if (!result_count && ti.length == 1 && !*p)
-        ; /* ignore the very first one if it is a 0 */
-      else
+      if (ti.length != 1 && *p != 1)
         {
-          rc = gcry_mpi_scan (result+result_count, GCRYMPI_FMT_USG, p,
-                              ti.length, NULL);
-          if (rc)
-            {
-              log_error ("error parsing key parameter: %s\n",
-                         gpg_strerror (rc));
-              goto bailout;
-            }
-          result_count++;
+          log_error ("error parsing private ecPublicKey parameter: %s\n",
+                     "bad version");
+          goto bailout;
+        }
+      p += ti.length;
+      n -= ti.length;
+      if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_OCTET_STRING)
+        goto bailout;
+      if (len < ti.nhdr)
+        goto bailout;
+      len -= ti.nhdr;
+      if (len < ti.length)
+        goto bailout;
+      len -= ti.length;
+      /* log_printhex (p, ti.length, "ecc q="); */
+      err = gcry_mpi_scan (ctx->privatekey, GCRYMPI_FMT_USG,
+                           p, ti.length, NULL);
+      if (err)
+        {
+          log_error ("error parsing key parameter: %s\n", gpg_strerror (err));
+          goto bailout;
         }
       p += ti.length;
       n -= ti.length;
+
+      len = 0;  /* Skip the rest.  */
+    }
+  else  /* RSA case */
+    {
+      for (keyelem_count=0; len && keyelem_count < 9;)
+        {
+          if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_INTEGER)
+            goto bailout;
+          if (len < ti.nhdr)
+            goto bailout;
+          len -= ti.nhdr;
+          if (len < ti.length)
+            goto bailout;
+          len -= ti.length;
+          if (!keyelem_count && ti.length == 1 && !*p)
+            ; /* ignore the very first one if it is a 0 */
+          else
+            {
+              err = gcry_mpi_scan (ctx->privatekey+keyelem_count,
+                                  GCRYMPI_FMT_USG, p, ti.length, NULL);
+              if (err)
+                {
+                  log_error ("error parsing key parameter: %s\n",
+                             gpg_strerror (err));
+                  goto bailout;
+                }
+              keyelem_count++;
+            }
+          p += ti.length;
+          n -= ti.length;
+        }
     }
   if (len)
     goto bailout;
 
+  goto leave;
+
+ bailout:
+  gcry_free (plain);
+  log_error ("data error at \"%s\", offset %zu\n",
+              where, (size_t)((p - p_start) + startoffset));
+  if (!err)
+    err = gpg_error (GPG_ERR_GENERAL);
+
+ leave:
   gcry_free (cram_buffer);
   if (r_consumed)
     *r_consumed = consumed;
-  return result;
+  return err;
+}
+
+
+static gpg_error_t
+parse_cert_bag (struct p12_parse_ctx_s *ctx,
+                const unsigned char *buffer, size_t length,
+                int startoffset,
+                size_t *r_consumed)
+{
+  gpg_error_t err = 0;
+  struct tag_info ti;
+  const unsigned char *p = buffer;
+  const unsigned char *p_start = buffer;
+  size_t n = length;
+  const char *where;
+  size_t consumed = 0; /* Number of bytes consumed from the original buffer. */
+
+  if (opt_verbose)
+    log_info ("processing certBag\n");
+
+  /* Expect:
+   *  [0]
+   *    SEQUENCE
+   *      OBJECT IDENTIFIER pkcs-12-certBag
+   */
+  where = "certbag.before.certheader";
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class != CLASS_CONTEXT || ti.tag)
+    goto bailout;
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_SEQUENCE)
+    goto bailout;
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_OBJECT_ID
+      || ti.length != DIM(oid_x509Certificate_for_pkcs_12)
+      || memcmp (p, oid_x509Certificate_for_pkcs_12,
+                 DIM(oid_x509Certificate_for_pkcs_12)))
+    goto bailout;
+  p += DIM(oid_x509Certificate_for_pkcs_12);
+  n -= DIM(oid_x509Certificate_for_pkcs_12);
+
+  /* Expect:
+   *  [0]
+   *    OCTET STRING encapsulates -- the certificates
+   */
+  where = "certbag.before.octetstring";
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class != CLASS_CONTEXT || ti.tag)
+    goto bailout;
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_OCTET_STRING || ti.ndef)
+    goto bailout;
+
+  /* Return the certificate from the octet string. */
+  if (ctx->certcb)
+     ctx->certcb (ctx->certcbarg, p, ti.length);
+
+  p += ti.length;
+  n -= ti.length;
+
+  if (!n)
+    goto leave;  /* ready.  */
+
+  /* Expect:
+   *  SET
+   *    SEQUENCE  -- we actually ignore this.
+   */
+  where = "certbag.attribute_set";
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (!ti.class && ti.tag == TAG_SET && !ti.ndef)
+    { /* Comsume the optional SET. */
+      p += ti.length;
+      n -= ti.length;
+      if (parse_tag (&p, &n, &ti))
+        goto bailout;
+    }
+
+  goto leave;
 
  bailout:
-  gcry_free (plain);
-  if (result)
+  log_error ( "data error at \"%s\", offset %u\n",
+              where, (unsigned int)((p - p_start) + startoffset));
+  err = gpg_error (GPG_ERR_GENERAL);
+
+ leave:
+  if (r_consumed)
+    *r_consumed = consumed;
+  return err;
+}
+
+
+static gpg_error_t
+parse_bag_data (struct p12_parse_ctx_s *ctx,
+                const unsigned char *buffer, size_t length, int startoffset,
+                size_t *r_consumed)
+{
+  gpg_error_t err = 0;
+  struct tag_info ti;
+  const unsigned char *p = buffer;
+  const unsigned char *p_start = buffer;
+  size_t n = length;
+  const char *where;
+  unsigned char *cram_buffer = NULL;
+  size_t consumed = 0; /* Number of bytes consumed from the original buffer. */
+
+  /* Expect:
+   * [0]
+   *   OCTET STRING, encapsulates
+   */
+  where = "data";
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class != CLASS_CONTEXT || ti.tag)
+    goto bailout;
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_OCTET_STRING)
+    goto bailout;
+
+
+  consumed = p - p_start;
+  if (ti.is_constructed && ti.ndef)
+    {
+      /* Mozilla exported certs now come with single byte chunks of
+         octet strings.  (Mozilla Firefox 1.0.4).  Arghh. */
+      where = "data.cram_os";
+      cram_buffer = cram_octet_string ( p, &n, &consumed);
+      if (!cram_buffer)
+        goto bailout;
+      p = p_start = cram_buffer;
+      if (r_consumed)
+        *r_consumed = consumed;
+      r_consumed = NULL; /* Ugly hack to not update that value on return. */
+    }
+
+  /* Expect:
+   * SEQUENCE
+   *   SEQUENCE
+   */
+  where = "data.2seqs";
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_SEQUENCE)
+    goto bailout;
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_SEQUENCE)
+    goto bailout;
+
+  /* Expect:
+   * OBJECT IDENTIFIER
+   */
+  where = "data.oid";
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_OBJECT_ID)
+    goto bailout;
+
+  /* Now divert to the actual parser.  */
+  if (ti.length == DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)
+      && !memcmp (p, oid_pkcs_12_pkcs_8ShroudedKeyBag,
+                 DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)))
     {
-      for (i=0; result[i]; i++)
-        gcry_mpi_release (result[i]);
-      gcry_free (result);
+      p += DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag);
+      n -= DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag);
+
+      if (parse_shrouded_key_bag (ctx, p, n,
+                                  startoffset + (p - p_start), r_consumed))
+        goto bailout;
     }
-  gcry_free (cram_buffer);
+  else if ( ti.length == DIM(oid_pkcs_12_CertBag)
+            && !memcmp (p, oid_pkcs_12_CertBag, DIM(oid_pkcs_12_CertBag)))
+    {
+      p += DIM(oid_pkcs_12_CertBag);
+      n -= DIM(oid_pkcs_12_CertBag);
+
+      if (parse_cert_bag (ctx, p, n,
+                          startoffset + (p - p_start), r_consumed))
+        goto bailout;
+    }
+  else
+    goto bailout;
+
+  goto leave;
+
+ bailout:
   log_error ( "data error at \"%s\", offset %u\n",
-              where, (unsigned int)((p - buffer) + startoffset));
-  if (r_consumed)
+              where, (unsigned int)((p - p_start) + startoffset));
+  err = gpg_error (GPG_ERR_GENERAL);
+
+ leave:
+  gcry_free (cram_buffer);
+  if (r_consumed) /* Store the number of consumed bytes unless already done. */
     *r_consumed = consumed;
-  return NULL;
+  return err;
 }
 
 
@@ -1509,11 +1826,12 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
    that it is only able to look for 3DES encoded encryptedData and
    tries to extract the first private key object it finds.  In case of
    an error NULL is returned. CERTCB and CERRTCBARG are used to pass
-   X.509 certificates back to the caller. */
+   X.509 certificates back to the caller.  If R_CURVE is not NULL and
+   an ECC key was found the OID of the curve is stored there. */
 gcry_mpi_t *
 p12_parse (const unsigned char *buffer, size_t length, const char *pw,
            void (*certcb)(void*, const unsigned char*, size_t),
-           void *certcbarg, int *r_badpass)
+           void *certcbarg, int *r_badpass, char **r_curve)
 {
   struct tag_info ti;
   const unsigned char *p = buffer;
@@ -1522,10 +1840,17 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
   const char *where;
   int bagseqlength, len;
   int bagseqndef, lenndef;
-  gcry_mpi_t *result = NULL;
   unsigned char *cram_buffer = NULL;
+  size_t consumed;
+  struct p12_parse_ctx_s ctx = { NULL };
 
   *r_badpass = 0;
+
+  ctx.certcb = certcb;
+  ctx.certcbarg = certcbarg;
+  ctx.password = pw;
+
+
   where = "pfx";
   if (parse_tag (&p, &n, &ti))
     goto bailout;
@@ -1554,17 +1879,17 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
 
   if (parse_tag (&p, &n, &ti))
     goto bailout;
-  if (ti.class != ASNCONTEXT || ti.tag)
+  if (ti.class != CLASS_CONTEXT || ti.tag)
     goto bailout;
   if (parse_tag (&p, &n, &ti))
     goto bailout;
-  if (ti.class != UNIVERSAL || ti.tag != TAG_OCTET_STRING)
+  if (ti.class != CLASS_UNIVERSAL || ti.tag != TAG_OCTET_STRING)
     goto bailout;
 
   if (ti.is_constructed && ti.ndef)
     {
       /* Mozilla exported certs now come with single byte chunks of
-         octect strings.  (Mozilla Firefox 1.0.4).  Arghh. */
+         octet strings.  (Mozilla Firefox 1.0.4).  Arghh. */
       where = "cram-bags";
       cram_buffer = cram_octet_string ( p, &n, NULL);
       if (!cram_buffer)
@@ -1575,19 +1900,20 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
   where = "bags";
   if (parse_tag (&p, &n, &ti))
     goto bailout;
-  if (ti.class != UNIVERSAL || ti.tag != TAG_SEQUENCE)
+  if (ti.class != CLASS_UNIVERSAL || ti.tag != TAG_SEQUENCE)
     goto bailout;
   bagseqndef = ti.ndef;
   bagseqlength = ti.length;
   while (bagseqlength || bagseqndef)
     {
-/*       log_debug ( "at offset %u\n", (p - p_start)); */
+      /* log_debug ("p12_parse: at offset %ld\n", (p - p_start)); */
       where = "bag-sequence";
       if (parse_tag (&p, &n, &ti))
         goto bailout;
-      if (bagseqndef && ti.class == UNIVERSAL && !ti.tag && !ti.is_constructed)
+      if (bagseqndef && ti.class == CLASS_UNIVERSAL
+          && !ti.tag && !ti.is_constructed)
         break; /* Ready */
-      if (ti.class != UNIVERSAL || ti.tag != TAG_SEQUENCE)
+      if (ti.class != CLASS_UNIVERSAL || ti.tag != TAG_SEQUENCE)
         goto bailout;
 
       if (!bagseqndef)
@@ -1612,16 +1938,14 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
       if (ti.tag == TAG_OBJECT_ID && ti.length == DIM(oid_encryptedData)
           && !memcmp (p, oid_encryptedData, DIM(oid_encryptedData)))
         {
-          size_t consumed = 0;
 
           p += DIM(oid_encryptedData);
           n -= DIM(oid_encryptedData);
           if (!lenndef)
             len -= DIM(oid_encryptedData);
           where = "bag.encryptedData";
-          if (parse_bag_encrypted_data (p, n, (p - p_start), &consumed, pw,
-                                        certcb, certcbarg,
-                                        result? NULL : &result, r_badpass))
+          consumed = 0;
+          if (parse_bag_encrypted_data (&ctx, p, n, (p - p_start), &consumed))
             goto bailout;
           if (lenndef)
             len += consumed;
@@ -1629,30 +1953,21 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
       else if (ti.tag == TAG_OBJECT_ID && ti.length == DIM(oid_data)
                && !memcmp (p, oid_data, DIM(oid_data)))
         {
-          if (result)
-            {
-              log_info ("already got an key object, skipping this one\n");
-              p += ti.length;
-              n -= ti.length;
-            }
-          else
-            {
-              size_t consumed = 0;
-
-              p += DIM(oid_data);
-              n -= DIM(oid_data);
-              if (!lenndef)
-                len -= DIM(oid_data);
-              result = parse_bag_data (p, n, (p - p_start), &consumed, pw);
-              if (!result)
-                goto bailout;
-              if (lenndef)
-                len += consumed;
-            }
+          p += DIM(oid_data);
+          n -= DIM(oid_data);
+          if (!lenndef)
+            len -= DIM(oid_data);
+
+          where = "bag.data";
+          consumed = 0;
+          if (parse_bag_data (&ctx, p, n, (p - p_start), &consumed))
+            goto bailout;
+          if (lenndef)
+            len += consumed;
         }
       else
         {
-          log_info ("unknown bag type - skipped\n");
+          log_info ("unknown outer bag type - skipped\n");
           p += ti.length;
           n -= ti.length;
         }
@@ -1666,25 +1981,35 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
           /* Need to skip the Null Tag. */
           if (parse_tag (&p, &n, &ti))
             goto bailout;
-          if (!(ti.class == UNIVERSAL && !ti.tag && !ti.is_constructed))
+          if (!(ti.class == CLASS_UNIVERSAL && !ti.tag && !ti.is_constructed))
             goto bailout;
         }
     }
 
   gcry_free (cram_buffer);
-  return result;
+  if (r_curve)
+    *r_curve = ctx.curve;
+  else
+    gcry_free (ctx.curve);
+
+  return ctx.privatekey;
+
  bailout:
   log_error ("error at \"%s\", offset %u\n",
              where, (unsigned int)(p - p_start));
-  if (result)
+  if (ctx.privatekey)
     {
       int i;
 
-      for (i=0; result[i]; i++)
-        gcry_mpi_release (result[i]);
-      gcry_free (result);
+      for (i=0; ctx.privatekey[i]; i++)
+        gcry_mpi_release (ctx.privatekey[i]);
+      gcry_free (ctx.privatekey);
+      ctx.privatekey = NULL;
     }
   gcry_free (cram_buffer);
+  gcry_free (ctx.curve);
+  if (r_curve)
+    *r_curve = NULL;
   return NULL;
 }
 
@@ -1876,7 +2201,7 @@ create_final (struct buffer_s *sequences, const char *pw, size_t *r_length)
   /* Ready. */
   resultlen = p - result;
   if (needed != resultlen)
-    log_debug ("length mismatch: %lu, %lu\n",
+    log_debug ("p12_parse: warning: length mismatch: %lu, %lu\n",
                (unsigned long)needed, (unsigned long)resultlen);
 
   *r_length = resultlen;
@@ -1885,36 +2210,36 @@ create_final (struct buffer_s *sequences, const char *pw, size_t *r_length)
 
 
 /* Build a DER encoded SEQUENCE with the key:
-
-   SEQUENCE {
-     INTEGER 0
-     SEQUENCE {
-       OBJECT IDENTIFIER rsaEncryption (1 2 840 113549 1 1 1)
-       NULL
-       }
-     OCTET STRING, encapsulates {
-       SEQUENCE {
-         INTEGER 0
-         INTEGER
-         INTEGER
-         INTEGER
-         INTEGER
-         INTEGER
-         INTEGER
-         INTEGER
-         INTEGER
-         }
-       }
-     }
-
-  MODE controls what is being generated:
-     0 - As described above
-     1 - Ditto but without the padding
-     2 - Only the inner part (pkcs#1)
-*/
+ *
+ * SEQUENCE {  -- OneAsymmetricKey (RFC-5958)
+ *   INTEGER 0
+ *   SEQUENCE {
+ *     OBJECT IDENTIFIER rsaEncryption (1 2 840 113549 1 1 1)
+ *     NULL
+ *     }
+ *   OCTET STRING, encapsulates {
+ *     SEQUENCE {   -- RSAPrivateKey (RFC-3447)
+ *       INTEGER 0  -- Version
+ *       INTEGER    -- n
+ *       INTEGER    -- e
+ *       INTEGER    -- d
+ *       INTEGER    -- p
+ *       INTEGER    -- q
+ *       INTEGER    -- d mod (p-1)
+ *       INTEGER    -- d mod (q-1)
+ *       INTEGER    -- q^-1 mod p
+ *       }
+ *     }
+ *   }
+ *
+ * MODE controls what is being generated:
+ *   0 - As described above
+ *   1 - Ditto but without the padding
+ *   2 - Only the inner part (pkcs#1)
+ */
 
 static unsigned char *
-build_key_sequence (gcry_mpi_t *kparms, int mode, size_t *r_length)
+build_rsa_key_sequence (gcry_mpi_t *kparms, int mode, size_t *r_length)
 {
   int rc, i;
   size_t needed, n;
@@ -2030,7 +2355,7 @@ build_key_sequence (gcry_mpi_t *kparms, int mode, size_t *r_length)
     }
 
   plainlen = p - plain;
-  assert (needed == plainlen);
+  log_assert (needed == plainlen);
 
   if (!mode)
     {
@@ -2045,6 +2370,156 @@ build_key_sequence (gcry_mpi_t *kparms, int mode, size_t *r_length)
 }
 
 
+/* Build a DER encoded SEQUENCE for an ECC key:
+ *
+ * SEQUENCE {  -- OneAsymmetricKey (RFC-5958)
+ *   INTEGER 0
+ *   SEQUENCE {
+ *     OBJECT IDENTIFIER ecPublicKey (1 2 840 10045 2 1)
+ *     OBJECT IDENTIFIER -- curvename
+ *     }
+ *   OCTET STRING, encapsulates {
+ *     SEQUENCE {      -- ECPrivateKey
+ *       INTEGER  1    --  version
+ *       OCTET STRING  -- privateKey
+ *       [1] {
+ *          BIT STRING - publicKey
+ *       }
+ *     }
+ *   }
+ * }
+ *
+ * For details see RFC-5480 and RFC-5915 (ECparameters are not created).
+ *
+ * KPARMS[0] := Opaque MPI with the curve name as dotted-decimal string.
+ * KPARMS[1] := Opaque MPI with the public key (q)
+ * KPARMS[2] := Opaque MPI with the private key (d)
+ * MODE controls what is being generated:
+ *    0 - As described above
+ *    1 - Ditto but without the extra padding needed for pcsk#12
+ *    2 - Only the octet string (ECPrivateKey)
+ */
+
+static unsigned char *
+build_ecc_key_sequence (gcry_mpi_t *kparms, int mode, size_t *r_length)
+{
+  gpg_error_t err;
+  unsigned int nbits, n;
+  const unsigned char *s;
+  char *p;
+  tlv_builder_t tb;
+  void *result;
+  size_t resultlen;
+  const char *curve;
+  unsigned int curvebits;
+  int e;
+  int i;
+  int strip_one;
+
+  for (i=0; kparms[i]; i++)
+    ;
+  if (i != 3)
+    {
+      log_error ("%s: invalid number of parameters\n", __func__);
+      return NULL;
+    }
+
+  s = gcry_mpi_get_opaque (kparms[0], &nbits);
+  n = (nbits+7)/8;
+  p = xtrymalloc (n + 1);
+  if (!p)
+    {
+      err = gpg_error_from_syserror ();
+      log_error ("%s:%d: error getting parameter: %s\n",
+                 __func__, __LINE__, gpg_strerror (err));
+      return NULL;
+    }
+  memcpy (p, s, n);
+  p[n] = 0;
+  /* We need to use our OpenPGP mapping to turn a curve name into its
+   * canonical numerical OID.  We should have a Libgcrypt function to
+   * do this; see bug report #4926.  */
+  curve = openpgp_curve_to_oid (p, &curvebits, NULL);
+  xfree (p);
+  if (!curve)
+    {
+      err = gpg_error (GPG_ERR_UNKNOWN_CURVE);
+      log_error ("%s:%d: error getting parameter: %s\n",
+                 __func__, __LINE__, gpg_strerror (err));
+      return NULL;
+    }
+
+  /* Unfortunately the private key D may come with a single leading
+   * zero byte.  This is becuase at some point it was treated as
+   * signed MPI and the code made sure that it is always interpreted
+   * as unsigned.  Fortunately we got the size of the curve and can
+   * detect such a case reliable.  */
+  s = gcry_mpi_get_opaque (kparms[2], &nbits);
+  n = (nbits+7)/8;
+  strip_one = (n == (curvebits+7)/8 + 1 && !*s);
+
+
+  tb = tlv_builder_new (1);
+  if (!tb)
+    {
+      err = gpg_error_from_syserror ();
+      log_error ("%s:%d: error creating new TLV builder: %s\n",
+                 __func__, __LINE__, gpg_strerror (err));
+      return NULL;
+    }
+  e = 0;
+  tlv_builder_add_tag (tb, 0, TAG_SEQUENCE);
+  tlv_builder_add_ptr (tb, 0, TAG_INTEGER, "\0", 1);
+  tlv_builder_add_tag (tb, 0, TAG_SEQUENCE);
+  e|= builder_add_oid (tb, 0, "1.2.840.10045.2.1");
+  e|= builder_add_oid (tb, 0, curve);
+  tlv_builder_add_end (tb);
+  tlv_builder_add_tag (tb, 0, TAG_OCTET_STRING);
+  tlv_builder_add_tag (tb, 0, TAG_SEQUENCE);
+  tlv_builder_add_ptr (tb, 0, TAG_INTEGER, "\x01", 1);
+  e|= builder_add_mpi (tb, 0, TAG_OCTET_STRING, kparms[2], strip_one);
+  tlv_builder_add_tag (tb, CLASS_CONTEXT, 1);
+  e|= builder_add_mpi (tb, 0, TAG_BIT_STRING, kparms[1], 0);
+  tlv_builder_add_end (tb);
+  tlv_builder_add_end (tb);
+  tlv_builder_add_end (tb);
+  tlv_builder_add_end (tb);
+
+  err = tlv_builder_finalize (tb, &result, &resultlen);
+  if (err || e)
+    {
+      if (!err)
+        err = gpg_error (GPG_ERR_GENERAL);
+      log_error ("%s:%d: tlv building failed: %s\n",
+                 __func__, __LINE__, gpg_strerror (err));
+      return NULL;
+    }
+
+  /* Append some pad characters if needed. */
+  if (!mode && (n = 8 - resultlen % 8))
+    {
+      p = xtrymalloc_secure (resultlen + n);
+      if (!p)
+        {
+          err = gpg_error_from_syserror ();
+          log_error ("%s:%d: error allocating buffer: %s\n",
+                     __func__, __LINE__, gpg_strerror (err));
+          xfree (result);
+          return NULL;
+        }
+      memcpy (p, result, resultlen);
+      xfree (result);
+      result = p;
+      p = (unsigned char*)result + resultlen;
+      for (i=0; i < n; i++, resultlen++)
+        *p++ = n;
+    }
+
+  *r_length = resultlen;
+
+  return result;
+}
+
 
 static unsigned char *
 build_key_bag (unsigned char *buffer, size_t buflen, char *salt,
@@ -2167,7 +2642,7 @@ build_key_bag (unsigned char *buffer, size_t buflen, char *salt,
 
   keybaglen = p - keybag;
   if (needed != keybaglen)
-    log_debug ("length mismatch: %lu, %lu\n",
+    log_debug ("p12_parse: warning: length mismatch: %lu, %lu\n",
                (unsigned long)needed, (unsigned long)keybaglen);
 
   *r_length = keybaglen;
@@ -2266,7 +2741,7 @@ build_cert_bag (unsigned char *buffer, size_t buflen, char *salt,
   certbaglen = p - certbag;
 
   if (needed != certbaglen)
-    log_debug ("length mismatch: %lu, %lu\n",
+    log_debug ("p12_parse: warning: length mismatch: %lu, %lu\n",
                (unsigned long)needed, (unsigned long)certbaglen);
 
   *r_length = certbaglen;
@@ -2284,7 +2759,7 @@ build_cert_sequence (const unsigned char *buffer, size_t buflen,
   size_t certseqlen;
   int i;
 
-  assert (strlen (keyidstr) == 8);
+  log_assert (strlen (keyidstr) == 8);
 
   /* Walk 8 steps down to collect the info: */
 
@@ -2377,7 +2852,7 @@ build_cert_sequence (const unsigned char *buffer, size_t buflen,
 
   certseqlen = p - certseq;
   if (needed != certseqlen)
-    log_debug ("length mismatch: %lu, %lu\n",
+    log_debug ("p12_parse: warning: length mismatch: %lu, %lu\n",
                (unsigned long)needed, (unsigned long)certseqlen);
 
   /* Append some pad characters; we already allocated extra space. */
@@ -2489,7 +2964,16 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t certlen,
   if (kparms)
     {
       /* Encode the key. */
-      buffer = build_key_sequence (kparms, 0, &buflen);
+      int i;
+
+      /* Right, that is a stupid way to distinguish ECC from RSA.  */
+      for (i=0; kparms[i]; i++)
+        ;
+
+      if (i == 3 && gcry_mpi_get_flag (kparms[0], GCRYMPI_FLAG_OPAQUE))
+        buffer = build_ecc_key_sequence (kparms, 0, &buflen);
+      else
+        buffer = build_rsa_key_sequence (kparms, 0, &buflen);
       if (!buffer)
         goto failure;
 
@@ -2534,101 +3018,28 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t certlen,
 }
 
 
-/* This is actually not a pkcs#12 function but one which creates an
-   unencrypted a pkcs#1 private key.  */
+/* This is actually not a PKCS#12 function but one which creates an
+ * unencrypted PKCS#1 private key.  */
 unsigned char *
 p12_raw_build (gcry_mpi_t *kparms, int rawmode, size_t *r_length)
 {
   unsigned char *buffer;
   size_t buflen;
+  int i;
 
-  assert (rawmode == 1 || rawmode == 2);
-  buffer = build_key_sequence (kparms, rawmode, &buflen);
+  log_assert (rawmode == 1 || rawmode == 2);
+
+  /* Right, that is a stupid way to distinguish ECC from RSA.  */
+  for (i=0; kparms[i]; i++)
+    ;
+
+  if (gcry_mpi_get_flag (kparms[0], GCRYMPI_FLAG_OPAQUE))
+    buffer = build_ecc_key_sequence (kparms, rawmode, &buflen);
+  else
+    buffer = build_rsa_key_sequence (kparms, rawmode, &buflen);
   if (!buffer)
     return NULL;
 
   *r_length = buflen;
   return buffer;
 }
-
-
-#ifdef TEST
-
-static void
-cert_cb (void *opaque, const unsigned char *cert, size_t certlen)
-{
-  printf ("got a certificate of %u bytes length\n", certlen);
-}
-
-int
-main (int argc, char **argv)
-{
-  FILE *fp;
-  struct stat st;
-  unsigned char *buf;
-  size_t buflen;
-  gcry_mpi_t *result;
-  int badpass;
-
-  if (argc != 3)
-    {
-      fprintf (stderr, "usage: testp12 file passphrase\n");
-      return 1;
-    }
-
-  gcry_control (GCRYCTL_DISABLE_SECMEM, NULL);
-  gcry_control (GCRYCTL_INITIALIZATION_FINISHED, NULL);
-
-  fp = gnupg_fopen (argv[1], "rb");
-  if (!fp)
-    {
-      fprintf (stderr, "can't open '%s': %s\n", argv[1], strerror (errno));
-      return 1;
-    }
-
-  if (fstat (fileno(fp), &st))
-    {
-      fprintf (stderr, "can't stat '%s': %s\n", argv[1], strerror (errno));
-      return 1;
-    }
-
-  buflen = st.st_size;
-  buf = gcry_malloc (buflen+1);
-  if (!buf || fread (buf, buflen, 1, fp) != 1)
-    {
-      fprintf (stderr, "error reading '%s': %s\n", argv[1], strerror (errno));
-      return 1;
-    }
-  fclose (fp);
-
-  result = p12_parse (buf, buflen, argv[2], cert_cb, NULL, &badpass);
-  if (result)
-    {
-      int i, rc;
-      unsigned char *tmpbuf;
-
-      for (i=0; result[i]; i++)
-        {
-          rc = gcry_mpi_aprint (GCRYMPI_FMT_HEX, &tmpbuf,
-                                NULL, result[i]);
-          if (rc)
-            printf ("%d: [error printing number: %s]\n",
-                    i, gpg_strerror (rc));
-          else
-            {
-              printf ("%d: %s\n", i, tmpbuf);
-              gcry_free (tmpbuf);
-            }
-        }
-    }
-
-  return 0;
-
-}
-
-/*
-Local Variables:
-compile-command: "gcc -Wall -O0 -g -DTEST=1 -o minip12 minip12.c ../common/libcommon.a -L /usr/local/lib -lgcrypt -lgpg-error"
-End:
-*/
-#endif /* TEST */
diff --git a/sm/minip12.h b/sm/minip12.h
index 343b733..84c5f5f 100644
--- a/sm/minip12.h
+++ b/sm/minip12.h
@@ -22,12 +22,13 @@
 
 #include <gcrypt.h>
 
+
 void p12_set_verbosity (int verbose);
 
 gcry_mpi_t *p12_parse (const unsigned char *buffer, size_t length,
                        const char *pw,
                        void (*certcb)(void*, const unsigned char*, size_t),
-                       void *certcbarg, int *r_badpass);
+                       void *certcbarg, int *r_badpass, char **r_curve);
 
 unsigned char *p12_build (gcry_mpi_t *kparms,
                           const void *cert, size_t certlen,
diff --git a/sm/verify.c b/sm/verify.c
index 3c5279e..5510f42 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -516,6 +516,13 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp)
           && gnupg_digest_is_compliant (CO_DE_VS, sigval_hash_algo))
         gpgsm_status (ctrl, STATUS_VERIFICATION_COMPLIANCE_MODE,
                       gnupg_status_compliance_flag (CO_DE_VS));
+      else if (opt.require_compliance
+               && opt.compliance == CO_DE_VS)
+        {
+          log_error (_("operation forced to fail due to"
+                       " unfulfilled compliance rules\n"));
+          gpgsm_errors_seen = 1;
+        }
 
 
       /* Now we can check the signature.  */
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c7cd7f5..a70f0d0 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -301,6 +301,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/tests/gpgme/Makefile.in b/tests/gpgme/Makefile.in
index c5b8ca3..d06bad8 100644
--- a/tests/gpgme/Makefile.in
+++ b/tests/gpgme/Makefile.in
@@ -230,6 +230,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/tests/gpgscm/Makefile.in b/tests/gpgscm/Makefile.in
index 624d9c8..503903a 100644
--- a/tests/gpgscm/Makefile.in
+++ b/tests/gpgscm/Makefile.in
@@ -290,6 +290,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/tests/gpgsm/Makefile.in b/tests/gpgsm/Makefile.in
index e7a3152..69109fd 100644
--- a/tests/gpgsm/Makefile.in
+++ b/tests/gpgsm/Makefile.in
@@ -230,6 +230,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/tests/migrations/Makefile.in b/tests/migrations/Makefile.in
index cf7a9fe..0cc6786 100644
--- a/tests/migrations/Makefile.in
+++ b/tests/migrations/Makefile.in
@@ -230,6 +230,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/tests/openpgp/Makefile.in b/tests/openpgp/Makefile.in
index f2d943e..a911259 100644
--- a/tests/openpgp/Makefile.in
+++ b/tests/openpgp/Makefile.in
@@ -273,6 +273,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/tests/openpgp/gpgconf.scm b/tests/openpgp/gpgconf.scm
index a940b45..16e435d 100644
--- a/tests/openpgp/gpgconf.scm
+++ b/tests/openpgp/gpgconf.scm
@@ -37,10 +37,9 @@
 		(assert (or (not (opt::value)) (string=? "" (opt::value)))))))
 	(progress ".")))))
  (lambda (name . rest) name)
- (list "keyserver" "verbose" "quiet")
+ (list "keyserver" "verbose")
  (list (gpg-config 'gpg "keyserver")
-       (gpg-config 'gpg "verbose")
-       (gpg-config 'gpg "quiet"))
+       (gpg-config 'gpg "verbose"))
  (list (lambda (i) (if (even? i) "hkp://foo.bar" "hkps://bar.baz"))
        ;; gpgconf: argument for option verbose of type 0 (none) must
        ;; be positive
diff --git a/tests/openpgp/quick-key-manipulation.scm b/tests/openpgp/quick-key-manipulation.scm
index 2023f17..6cdf19a 100755
--- a/tests/openpgp/quick-key-manipulation.scm
+++ b/tests/openpgp/quick-key-manipulation.scm
@@ -34,6 +34,8 @@
 (define alpha "Alpha <alpha@invalid.example.net>")
 (define bravo "Bravo <bravo@invalid.example.net>")
 (define charlie "Charlie <charlie@invalid.example.net>")
+(define delta "Delta <delta@invalid.example.net>")
+(define deltahash "359DC5EFF98B14A58AAA615C638E8BD0CEDA537B")
 
 (define (key-data key)
   (filter (lambda (x) (or (string=? (car x) "pub")
@@ -87,6 +89,10 @@
 (info "Checking that we can revoke a user ID...")
 (call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,alpha))
 
+(info "Checking that we can revoke a user ID by its hash...")
+(call-check `(,@GPG --quick-add-uid ,(exact bravo) ,delta))
+(call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,deltahash))
+
 (info "Checking that we get an error revoking a non-existent user ID.")
 (catch '()
        (call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,charlie))
diff --git a/tests/pkits/Makefile.in b/tests/pkits/Makefile.in
index 45a57dc..accdff2 100644
--- a/tests/pkits/Makefile.in
+++ b/tests/pkits/Makefile.in
@@ -217,6 +217,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 2c98779..e1b7da9 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -465,6 +465,7 @@ GNUPG_PINENTRY_PGM = @GNUPG_PINENTRY_PGM@
 GNUPG_PROTECT_TOOL_PGM = @GNUPG_PROTECT_TOOL_PGM@
 GNUPG_SCDAEMON_PGM = @GNUPG_SCDAEMON_PGM@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGRT_CONFIG = @GPGRT_CONFIG@
 GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@
 GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@
 GPG_ERROR_LIBS = @GPG_ERROR_LIBS@
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 250d6ca..eecfd67 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -1177,7 +1177,7 @@ main (int argc, char **argv)
   early_system_init ();
   gnupg_rl_initialize ();
   set_strusage (my_strusage);
-  log_set_prefix ("gpg-connect-agent", GPGRT_LOG_WITH_PREFIX);
+  log_set_prefix ("gpg-connect-agent", GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY);
 
   /* Make sure that our subsystems are ready.  */
   i18n_init();
diff --git a/tools/gpg-wks-server.c b/tools/gpg-wks-server.c
index 96f0a03..74bb551 100644
--- a/tools/gpg-wks-server.c
+++ b/tools/gpg-wks-server.c
@@ -808,17 +808,65 @@ get_policy_flags (policy_flags_t policy, const char *mbox)
 }
 
 
+/* Create the name for the pending file from NONCE and ADDRSPEC and
+ * store it at R_NAME.  */
+static gpg_error_t
+make_pending_fname (const char *nonce, const char *addrspec, char **r_name)
+{
+  gpg_error_t err = 0;
+  const char *domain;
+  char *addrspechash = NULL;
+  char sha1buf[20];
+
+  *r_name = NULL;
+
+  domain = addrspec? strchr (addrspec, '@') : NULL;
+  if (!domain || !domain[1] || domain == addrspec)
+    {
+      err = gpg_error (GPG_ERR_INV_ARG);
+      goto leave;
+    }
+  domain++;
+  if (strchr (domain, '/') || strchr (domain, '\\'))
+    {
+      log_info ("invalid domain detected ('%s')\n", domain);
+      err = gpg_error (GPG_ERR_NOT_FOUND);
+      goto leave;
+    }
+  gcry_md_hash_buffer (GCRY_MD_SHA1, sha1buf, addrspec, domain - addrspec - 1);
+  addrspechash = zb32_encode (sha1buf, 8*20);
+  if (!addrspechash)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+
+  *r_name = strconcat (nonce, ".", addrspechash, NULL);
+  if (!*r_name)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+
+ leave:
+  xfree (addrspechash);
+  return err;
+}
+
+
 /* We store the key under the name of the nonce we will then send to
  * the user.  On success the nonce is stored at R_NONCE and the file
- * name at R_FNAME.  */
+ * name at R_FNAME.  ADDRSPEC is used as part of the pending file name
+ * so that the nonce is associated with an address */
 static gpg_error_t
-store_key_as_pending (const char *dir, estream_t key,
+store_key_as_pending (const char *dir, estream_t key, const char *addrspec,
                       char **r_nonce, char **r_fname)
 {
   gpg_error_t err;
   char *dname = NULL;
   char *fname = NULL;
   char *nonce = NULL;
+  char *pendingname = NULL;
   estream_t outfp = NULL;
   char buffer[1024];
   size_t nbytes, nwritten;
@@ -847,7 +895,11 @@ store_key_as_pending (const char *dir, estream_t key,
       goto leave;
     }
 
-  fname = strconcat (dname, "/", nonce, NULL);
+  err = make_pending_fname (nonce, addrspec, &pendingname);
+  if (err)
+    goto leave;
+
+  fname = strconcat (dname, "/", pendingname, NULL);
   if (!fname)
     {
       err = gpg_error_from_syserror ();
@@ -916,6 +968,7 @@ store_key_as_pending (const char *dir, estream_t key,
       xfree (fname);
     }
   xfree (dname);
+  xfree (pendingname);
   return err;
 }
 
@@ -1206,7 +1259,7 @@ process_new_key (server_ctx_t ctx, estream_t key)
 
           xfree (nonce);
           xfree (fname);
-          err = store_key_as_pending (dname, key, &nonce, &fname);
+          err = store_key_as_pending (dname, key, sl->mbox, &nonce, &fname);
           if (err)
             goto leave;
 
@@ -1362,6 +1415,7 @@ check_and_publish (server_ctx_t ctx, const char *address, const char *nonce)
   char *fnewname = NULL;
   estream_t key = NULL;
   char *hash = NULL;
+  char *pendingname = NULL;
   const char *domain;
   const char *s;
   uidinfo_list_t sl;
@@ -1378,7 +1432,21 @@ check_and_publish (server_ctx_t ctx, const char *address, const char *nonce)
   domain = strchr (address, '@');
   log_assert (domain && domain[1]);
   domain++;
-  fname = make_filename_try (opt.directory, domain, "pending", nonce, NULL);
+  if (strchr (domain, '/') || strchr (domain, '\\')
+      || strchr (nonce, '/') || strchr (nonce, '\\'))
+    {
+      log_info ("invalid domain or nonce received ('%s', '%s')\n",
+                domain, nonce);
+      err = gpg_error (GPG_ERR_NOT_FOUND);
+      goto leave;
+    }
+
+  err = make_pending_fname (nonce, address, &pendingname);
+  if (err)
+    goto leave;
+
+  fname = make_filename_try (opt.directory, domain, "pending", pendingname,
+                             NULL);
   if (!fname)
     {
       err = gpg_error_from_syserror ();
@@ -1490,6 +1558,7 @@ check_and_publish (server_ctx_t ctx, const char *address, const char *nonce)
   xfree (fnewname);
   xfree (fname);
   xfree (nonce2);
+  xfree (pendingname);
   return err;
 }
 
@@ -1716,7 +1785,8 @@ expire_one_domain (const char *top_dirname, const char *domain)
                      __func__, gpg_strerror (err));
           goto leave;
         }
-      if (strlen (dentry->d_name) != 32)
+      /* The old files are 32 bytes, those created since 2.3.8 are 65 bytes. */
+      if (strlen (dentry->d_name) != 32 && strlen (dentry->d_name) != 65)
         {
           log_info ("garbage file '%s' ignored\n", fname);
           continue;
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index fa4e054..c9bdfeb 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1,6 +1,7 @@
 /* gpgconf-comp.c - Configuration utility for GnuPG.
  * Copyright (C) 2004, 2007-2011 Free Software Foundation, Inc.
  * Copyright (C) 2016 Werner Koch
+ * Copyright (C) 2020-2022 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -27,7 +28,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <assert.h>
 #include <errno.h>
 #include <time.h>
 #include <stdarg.h>
@@ -43,7 +43,6 @@
 # include <grp.h>
 #endif
 
-/* For log_logv(), asctimestamp(), gnupg_get_time ().  */
 #include "../common/util.h"
 #include "../common/i18n.h"
 #include "../common/exechelp.h"
@@ -62,13 +61,6 @@
 #define GPGNAME GPG_NAME
 #endif
 
-
-/* TODO:
-   Components: Add more components and their options.
-   Robustness: Do more validation.  Call programs to do validation for us.
-   Add options to change backend binary path.
-   Extract binary path for some backends from gpgsm/gpg config.
-*/
 
 
 #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 ))
@@ -110,93 +102,19 @@ static void gpg_agent_runtime_change (int killflag);
 static void scdaemon_runtime_change (int killflag);
 static void dirmngr_runtime_change (int killflag);
 
-/* Backend configuration.  Backends are used to decide how the default
-   and current value of an option can be determined, and how the
-   option can be changed.  To every option in every component belongs
-   exactly one backend that controls and determines the option.  Some
-   backends are programs from the GPG system.  Others might be
-   implemented by GPGConf itself.  If you change this enum, don't
-   forget to update GC_BACKEND below.  */
-typedef enum
-  {
-    /* Any backend, used for find_option ().  */
-    GC_BACKEND_ANY,
-
-    /* The Gnu Privacy Guard.  */
-    GC_BACKEND_GPG,
-
-    /* The Gnu Privacy Guard for S/MIME.  */
-    GC_BACKEND_GPGSM,
-
-    /* The GPG Agent.  */
-    GC_BACKEND_GPG_AGENT,
-
-    /* The GnuPG SCDaemon.  */
-    GC_BACKEND_SCDAEMON,
-
-    /* The GnuPG directory manager.  */
-    GC_BACKEND_DIRMNGR,
-
-    /* The LDAP server list file for the director manager.  */
-    GC_BACKEND_DIRMNGR_LDAP_SERVER_LIST,
-
-    /* The Pinentry (not a part of GnuPG, proper).  */
-    GC_BACKEND_PINENTRY,
-
-    /* The number of the above entries.  */
-    GC_BACKEND_NR
-  } gc_backend_t;
-
-
-/* To be able to implement generic algorithms for the various
-   backends, we collect all information about them in this struct.  */
-static const struct
-{
-  /* The name of the backend.  */
-  const char *name;
-
-  /* The name of the program that acts as the backend.  Some backends
-     don't have an associated program, but are implemented directly by
-     GPGConf.  In this case, PROGRAM is NULL.  */
-  char *program;
-
-  /* The module name (GNUPG_MODULE_NAME_foo) as defined by
-     ../common/util.h.  This value is used to get the actual installed
-     path of the program.  0 is used if no backend program is
-     available. */
-  char module_name;
 
-  /* The runtime change callback.  If KILLFLAG is true the component
-     is killed and not just reloaded.  */
-  void (*runtime_change) (int killflag);
 
-  /* The option name for the configuration filename of this backend.
-     This must be an absolute filename.  It can be an option from a
-     different backend (but then ordering of the options might
-     matter).  Note: This must be unique among all components.  */
-  const char *option_config_filename;
+
+/* STRING_ARRAY is a malloced array with malloced strings.  It is used
+ * a space to store strings so that other objects may point to these
+ * strings. It shall never be shrinked or any items changes.
+ * STRING_ARRAY itself may be reallocated to increase the size of the
+ * table.  STRING_ARRAY_USED is the number of items currently used,
+ * STRING_ARRAY_SIZE is the number of calloced slots. */
+static char  **string_array;
+static size_t string_array_used;
+static size_t string_array_size;
 
-  /* If this is a file backend rather than a program backend, then
-     this is the name of the option associated with the file.  */
-  const char *option_name;
-} gc_backend[GC_BACKEND_NR] =
-  {
-    { NULL },		/* GC_BACKEND_ANY dummy entry.  */
-    { GPG_DISP_NAME, GPGNAME, GNUPG_MODULE_NAME_GPG,
-      NULL, GPGCONF_NAME "-" GPG_NAME ".conf" },
-    { GPGSM_DISP_NAME, GPGSM_NAME, GNUPG_MODULE_NAME_GPGSM,
-      NULL, GPGCONF_NAME "-" GPGSM_NAME ".conf" },
-    { GPG_AGENT_DISP_NAME, GPG_AGENT_NAME, GNUPG_MODULE_NAME_AGENT,
-      gpg_agent_runtime_change, GPGCONF_NAME"-" GPG_AGENT_NAME ".conf" },
-    { SCDAEMON_DISP_NAME, SCDAEMON_NAME, GNUPG_MODULE_NAME_SCDAEMON,
-      scdaemon_runtime_change, GPGCONF_NAME"-" SCDAEMON_NAME ".conf" },
-    { DIRMNGR_DISP_NAME, DIRMNGR_NAME, GNUPG_MODULE_NAME_DIRMNGR,
-      dirmngr_runtime_change, GPGCONF_NAME "-" DIRMNGR_NAME ".conf" },
-    { DIRMNGR_DISP_NAME " LDAP Server List", NULL, 0,
-      NULL, "ldapserverlist-file", "LDAP Server" },
-    { "Pinentry", "pinentry", GNUPG_MODULE_NAME_PINENTRY,
-      NULL, GPGCONF_NAME "-pinentry.conf" },
-  };
 
 
 /* Option configuration.  */
@@ -342,15 +260,16 @@ static const struct
   };
 
 
-/* Option flags.  The flags which are used by the backends are defined
+/* Option flags.  The flags which are used by the components are defined
    by gc-opt-flags.h, included above.
 
    YOU MUST NOT CHANGE THE NUMBERS OF THE EXISTING FLAGS, AS THEY ARE
    PART OF THE EXTERNAL INTERFACE.  */
 
-/* Some entries in the option list are not options, but mark the
-   beginning of a new group of options.  These entries have the GROUP
-   flag set.  */
+/* Some entries in the emitted option list are not options, but mark
+   the beginning of a new group of options.  These entries have the
+   GROUP flag set.  Note that this is internally also known as a
+   header line. */
 #define GC_OPT_FLAG_GROUP	(1UL << 0)
 /* The ARG_OPT flag for an option indicates that the argument is
    optional.  This is never set for GC_ARG_TYPE_NONE options.  */
@@ -359,6 +278,10 @@ static const struct
    several times.  A comma separated list of arguments is used as the
    argument value.  */
 #define GC_OPT_FLAG_LIST	(1UL << 2)
+/* The RUNTIME flag for an option indicates that the option can be
+   changed at runtime.  */
+#define GC_OPT_FLAG_RUNTIME	(1UL << 3)
+
 
 
 /* A human-readable description for each flag.  */
@@ -378,734 +301,355 @@ static const struct
   };
 
 
-/* To each option, or group marker, the information in the GC_OPTION
-   struct is provided.  If you change this, don't forget to update the
-   option list of each component.  */
-struct gc_option
+
+/* Each option we want to support in gpgconf has the needed
+ * information in a static list per componenet.  This struct describes
+ * the info for a single option.  */
+struct known_option_s
 {
   /* If this is NULL, then this is a terminator in an array of unknown
-     length.  Otherwise, if this entry is a group marker (see FLAGS),
-     then this is the name of the group described by this entry.
-     Otherwise it is the name of the option described by this
-     entry.  The name must not contain a colon.  */
+   * length.  Otherwise it is the name of the option described by this
+   * entry.  The name must not contain a colon.  */
   const char *name;
 
-  /* The option flags.  If the GROUP flag is set, then this entry is a
-     group marker, not an option, and only the fields LEVEL,
-     DESC_DOMAIN and DESC are valid.  In all other cases, this entry
-     describes a new option and all fields are valid.  */
+  /* The option flags.  */
   unsigned long flags;
 
-  /* The expert level.  This field is valid for options and groups.  A
-     group has the expert level of the lowest-level option in the
-     group.  */
+  /* The expert level.  */
   gc_expert_level_t level;
 
-  /* A gettext domain in which the following description can be found.
-     If this is NULL, then DESC is not translated.  Valid for groups
-     and options.
-
-     Note that we try to keep the description of groups within the
-     gnupg domain.
-
-     IMPORTANT: If you add a new domain please make sure to add a code
-     set switching call to the function my_dgettext further below.  */
-  const char *desc_domain;
-
-  /* A gettext description for this group or option.  If it starts
-     with a '|', then the string up to the next '|' describes the
-     argument, and the description follows the second '|'.
-
-     In general enclosing these description in N_() is not required
-     because the description should be identical to the one in the
-     help menu of the respective program. */
-  const char *desc;
-
-  /* The following fields are only valid for options.  */
-
-  /* The type of the option argument.  */
+  /* The complex type of the option argument; the default of 0 is used
+   * for a standard type as returned by --dump-option-table.  */
   gc_arg_type_t arg_type;
+};
+typedef struct known_option_s known_option_t;
 
-  /* The backend that implements this option.  */
-  gc_backend_t backend;
-
-  /* The following fields are set to NULL at startup (because all
-     option's are declared as static variables).  They are at the end
-     of the list so that they can be omitted from the option
-     declarations.  */
-
-  /* This is true if the option is supported by this version of the
-     backend.  */
-  int active;
 
-  /* The default value for this option.  This is NULL if the option is
-     not present in the backend, the empty string if no default is
-     available, and otherwise a quoted string.  */
-  char *default_value;
+/* The known options of the GC_COMPONENT_GPG_AGENT component.  */
+static known_option_t known_options_gpg_agent[] =
+  {
+   { "verbose", GC_OPT_FLAG_LIST|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
+   { "disable-scdaemon", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME,
+                         GC_LEVEL_ADVANCED },
+   { "enable-ssh-support", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "ssh-fingerprint-digest", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
+   { "enable-putty-support", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "enable-extended-key-format", GC_OPT_FLAG_RUNTIME, GC_LEVEL_INVISIBLE },
+   { "debug-level", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED},
+   { "log-file", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
+     /**/        GC_ARG_TYPE_FILENAME },
+   { "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+
+   { "default-cache-ttl", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
+   { "default-cache-ttl-ssh", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
+   { "max-cache-ttl", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
+   { "max-cache-ttl-ssh", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
+   { "ignore-cache-for-signing", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
+   { "allow-emacs-pinentry", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
+   { "grab", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
+   { "no-allow-external-cache", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
+   { "no-allow-mark-trusted", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
+   { "no-allow-loopback-pinentry", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
+
+   { "enforce-passphrase-constraints", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
+   { "min-passphrase-len", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
+   { "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 },
+
+   { NULL }
+ };
 
-  /* The default argument is only valid if the "optional arg" flag is
-     set, and specifies the default argument (value) that is used if
-     the argument is omitted.  */
-  char *default_arg;
 
-  /* The current value of this option.  */
-  char *value;
+/* The known options of the GC_COMPONENT_SCDAEMON component.  */
+static known_option_t known_options_scdaemon[] =
+  {
+   { "verbose", GC_OPT_FLAG_LIST|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
+   { "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "reader-port",  GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
+   { "ctapi-driver", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
+   { "pcsc-driver",  GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
+   { "disable-ccid", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
+   { "disable-pinpad", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
+   { "enable-pinpad-varlen", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
+   { "card-timeout",         GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
+   { "debug-level", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED},
+   { "log-file",    GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
+     GC_ARG_TYPE_FILENAME },
+   { "deny-admin",  GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
+
+   { NULL }
+ };
 
-  /* The new flags for this option.  The only defined flag is actually
-     GC_OPT_FLAG_DEFAULT, and it means that the option should be
-     deleted.  In this case, NEW_VALUE is NULL.  */
-  unsigned long new_flags;
 
-  /* The new value of this option.  */
-  char *new_value;
-};
-typedef struct gc_option gc_option_t;
+/* The known options of the GC_COMPONENT_GPG component.  */
+static known_option_t known_options_gpg[] =
+  {
+   { "verbose",              GC_OPT_FLAG_LIST, GC_LEVEL_BASIC },
+   { "no-greeting",          GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "default-key",          GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "encrypt-to",           GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "group",                GC_OPT_FLAG_LIST, GC_LEVEL_ADVANCED,
+     GC_ARG_TYPE_ALIAS_LIST},
+   { "compliance",           GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
+   { "default-new-key-algo", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "trust-model",          GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "debug-level",          GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED },
+   { "log-file",             GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
+     GC_ARG_TYPE_FILENAME },
+   { "keyserver",            GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "auto-key-locate",      GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "auto-key-import",      GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "no-auto-key-import",   GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "auto-key-retrieve",    GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
+   { "no-auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "include-key-block",    GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "no-include-key-block", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "disable-dirmngr",      GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
+   { "max-cert-depth",       GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "completes-needed",     GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "marginals-needed",     GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+
+   /* The next is a pseudo option which we read via --gpgconf-list.
+    * The meta information is taken from the table below.  */
+   { "default_pubkey_algo",  GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "compliance_de_vs",     GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+
+   { NULL }
+ };
+static const char *known_pseudo_options_gpg[] =
+  {/*                     v-- ARGPARSE_TYPE_STRING */
+   "default_pubkey_algo:0:2:@:",
+   /* A basic compliance check for gpg.  We use gpg here but the
+    * result is valid for all components.
+    *                  v-- ARGPARSE_TYPE_INT */
+   "compliance_de_vs:0:1:@:",
+   NULL
+ };
 
-/* Use this macro to terminate an option list.  */
-#define GC_OPTION_NULL { NULL }
 
-
-#ifndef BUILD_WITH_AGENT
-#define gc_options_gpg_agent NULL
-#else
-/* The options of the GC_COMPONENT_GPG_AGENT component.  */
-static gc_option_t gc_options_gpg_agent[] =
+/* The known options of the GC_COMPONENT_GPGSM component.  */
+static known_option_t known_options_gpgsm[] =
  {
-   /* The configuration file to which we write the changes.  */
-   { GPGCONF_NAME"-" GPG_AGENT_NAME ".conf",
-     GC_OPT_FLAG_NONE, GC_LEVEL_INTERNAL,
-     NULL, NULL, GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG_AGENT },
-
-   { "Monitor",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Options controlling the diagnostic output") },
-   { "verbose", GC_OPT_FLAG_LIST|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
-     "gnupg", "verbose",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-   { "quiet", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
-     "gnupg", "be somewhat more quiet",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-   { "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-
-   { "Configuration",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Options controlling the configuration") },
-   { "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     "gnupg", "|FILE|read options from FILE",
-     GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG_AGENT },
-   { "disable-scdaemon", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "gnupg", "do not use the SCdaemon",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-   { "enable-ssh-support", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", "enable ssh support",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-   { "ssh-fingerprint-digest",
-     GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
-     "gnupg", "|ALGO|use ALGO to show ssh fingerprints",
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPG_AGENT },
-   { "enable-putty-support", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", "enable putty support",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-   { "enable-extended-key-format", GC_OPT_FLAG_RUNTIME, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-
-   { "Debug",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
-     "gnupg", N_("Options useful for debugging") },
-   { "debug-level", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
-     "gnupg", "|LEVEL|set the debugging level to LEVEL",
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPG_AGENT },
-   { "log-file", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
-     "gnupg", N_("|FILE|write server mode logs to FILE"),
-     GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG_AGENT },
-   { "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
-
-   { "Security",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Options controlling the security") },
-   { "default-cache-ttl", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_BASIC, "gnupg",
-     "|N|expire cached PINs after N seconds",
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
-   { "default-cache-ttl-ssh", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_ADVANCED, "gnupg",
-     N_("|N|expire SSH keys after N seconds"),
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
-   { "max-cache-ttl", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_EXPERT, "gnupg",
-     N_("|N|set maximum PIN cache lifetime to N seconds"),
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
-   { "max-cache-ttl-ssh", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_EXPERT, "gnupg",
-     N_("|N|set maximum SSH key lifetime to N seconds"),
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
-   { "ignore-cache-for-signing", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_BASIC, "gnupg", "do not use the PIN cache when signing",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-   { "allow-emacs-pinentry", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_ADVANCED,
-     "gnupg", "allow passphrase to be prompted through Emacs",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-   { "grab", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
-     "gnupg", NULL,
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-   { "no-allow-external-cache", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_BASIC, "gnupg", "disallow the use of an external password cache",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-   { "no-allow-mark-trusted", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_ADVANCED, "gnupg", "disallow clients to mark keys as \"trusted\"",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-   { "no-allow-loopback-pinentry", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_EXPERT, "gnupg", "disallow caller to override the pinentry",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-
-   { "Passphrase policy",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
-     "gnupg", N_("Options enforcing a passphrase policy") },
-   { "enforce-passphrase-constraints", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_EXPERT, "gnupg",
-     N_("do not allow bypassing the passphrase policy"),
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-   { "min-passphrase-len", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_ADVANCED, "gnupg",
-     N_("|N|set minimal required length for new passphrases to N"),
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
-   { "min-passphrase-nonalpha", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_EXPERT, "gnupg",
-     N_("|N|require at least N non-alpha characters for a new passphrase"),
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
-   { "check-passphrase-pattern", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_EXPERT,
-     "gnupg", N_("|FILE|check new passphrases against pattern in FILE"),
-     GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG_AGENT },
-   { "max-passphrase-days", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_EXPERT, "gnupg",
-     N_("|N|expire the passphrase after N days"),
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
-   { "enable-passphrase-history", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_EXPERT, "gnupg",
-     N_("do not allow the reuse of old passphrases"),
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
-   { "pinentry-timeout", GC_OPT_FLAG_RUNTIME,
-     GC_LEVEL_ADVANCED, "gnupg",
-     N_("|N|set the Pinentry timeout to N seconds"),
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT },
-
-   GC_OPTION_NULL
+   { "verbose",           GC_OPT_FLAG_LIST, GC_LEVEL_BASIC },
+   { "no-greeting",       GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "default-key",       GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "encrypt-to",        GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "disable-dirmngr",   GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
+   { "p12-charset",       GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "keyserver",         GC_OPT_FLAG_LIST, GC_LEVEL_INVISIBLE,
+                          GC_ARG_TYPE_LDAP_SERVER },
+   { "compliance",        GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
+   { "debug-level",       GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED },
+   { "log-file",          GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
+                          GC_ARG_TYPE_FILENAME },
+   { "faked-system-time",              GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "disable-crl-checks",             GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "enable-crl-checks",              GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "enable-ocsp",                    GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "include-certs",                  GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
+   { "disable-policy-checks",          GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "auto-issuer-key-retrieve",       GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "cipher-algo",                    GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "disable-trusted-cert-crl-check", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
+
+   /* Pseudo option follows.  See also table below. */
+   { "default_pubkey_algo",            GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+
+   { NULL }
+ };
+static const char *known_pseudo_options_gpgsm[] =
+  {/*                     v-- ARGPARSE_TYPE_STRING */
+   "default_pubkey_algo:0:2:@:",
+   NULL
  };
-#endif /*BUILD_WITH_AGENT*/
 
 
-#ifndef BUILD_WITH_SCDAEMON
-#define gc_options_scdaemon NULL
-#else
-/* The options of the GC_COMPONENT_SCDAEMON component.  */
-static gc_option_t gc_options_scdaemon[] =
+/* The known options of the GC_COMPONENT_DIRMNGR component.  */
+static known_option_t known_options_dirmngr[] =
  {
-   /* The configuration file to which we write the changes.  */
-   { GPGCONF_NAME"-"SCDAEMON_NAME".conf",
-     GC_OPT_FLAG_NONE, GC_LEVEL_INTERNAL,
-     NULL, NULL, GC_ARG_TYPE_FILENAME, GC_BACKEND_SCDAEMON },
-
-   { "Monitor",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Options controlling the diagnostic output") },
-   { "verbose", GC_OPT_FLAG_LIST|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
-     "gnupg", "verbose",
-     GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
-   { "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", "be somewhat more quiet",
-     GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
-   { "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
-
-   { "Configuration",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_EXPERT,
-     "gnupg", N_("Options controlling the configuration") },
-   { "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     "gnupg", "|FILE|read options from FILE",
-     GC_ARG_TYPE_FILENAME, GC_BACKEND_SCDAEMON },
-   { "reader-port", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
-     "gnupg", "|N|connect to reader at port N",
-     GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON },
-   { "ctapi-driver", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
-     "gnupg", "|NAME|use NAME as ct-API driver",
-     GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON },
-   { "pcsc-driver", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
-     "gnupg", "|NAME|use NAME as PC/SC driver",
-     GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON },
-   { "disable-ccid", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
-     "gnupg", "do not use the internal CCID driver",
-     GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
-   { "disable-pinpad", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
-     "gnupg", "do not use a reader's pinpad",
-     GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
-   { "enable-pinpad-varlen",
-     GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
-     "gnupg", "use variable length input for pinpad",
-     GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
-   { "card-timeout", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
-     "gnupg", "|N|disconnect the card after N seconds of inactivity",
-     GC_ARG_TYPE_UINT32, GC_BACKEND_SCDAEMON },
-
-   { "Debug",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
-     "gnupg", N_("Options useful for debugging") },
-   { "debug-level", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
-     "gnupg", "|LEVEL|set the debugging level to LEVEL",
-     GC_ARG_TYPE_STRING, GC_BACKEND_SCDAEMON },
-   { "log-file", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
-     "gnupg", N_("|FILE|write a log to FILE"),
-     GC_ARG_TYPE_FILENAME, GC_BACKEND_SCDAEMON },
-
-   { "Security",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Options controlling the security") },
-   { "deny-admin", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
-     "gnupg", "deny the use of admin card commands",
-     GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
-
-
-   GC_OPTION_NULL
+   { "verbose",           GC_OPT_FLAG_LIST, GC_LEVEL_BASIC },
+   { "no-greeting",       GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "resolver-timeout",  GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "nameserver",        GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "debug-level",       GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED },
+   { "log-file",          GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
+                          GC_ARG_TYPE_FILENAME },
+   { "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
+   { "force",             GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "use-tor",           GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "keyserver",         GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "ldapserver",        GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
+                          GC_ARG_TYPE_LDAP_SERVER },
+   { "disable-http",      GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "ignore-http-dp",    GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "http-proxy",        GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "honor-http-proxy",  GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "disable-ldap",      GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "ignore-ldap-dp",    GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "ldap-proxy",        GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "only-ldap-proxy",   GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "add-servers",       GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "ldaptimeout",       GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "max-replies",       GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "allow-ocsp",        GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "ocsp-responder",    GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "ocsp-signer",       GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+   { "allow-version-check",     GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "ignore-ocsp-service-url", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
+
+
+   { NULL }
  };
-#endif /*BUILD_WITH_SCDAEMON*/
 
-#ifndef BUILD_WITH_GPG
-#define gc_options_gpg NULL
-#else
-/* The options of the GC_COMPONENT_GPG component.  */
-static gc_option_t gc_options_gpg[] =
+
+/* The known options of the GC_COMPONENT_PINENTRY component.  */
+static known_option_t known_options_pinentry[] =
  {
-   /* The configuration file to which we write the changes.  */
-   { GPGCONF_NAME"-"GPG_NAME".conf",
-     GC_OPT_FLAG_NONE, GC_LEVEL_INTERNAL,
-     NULL, NULL, GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG },
-
-   { "Monitor",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Options controlling the diagnostic output") },
-   { "verbose", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
-     "gnupg", "verbose",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
-   { "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", "be somewhat more quiet",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
-   { "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
-
-   { "Configuration",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_EXPERT,
-     "gnupg", N_("Options controlling the configuration") },
-   { "default-key", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", N_("|NAME|use NAME as default secret key"),
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
-   { "encrypt-to", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", N_("|NAME|encrypt to user ID NAME as well"),
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
-   { "group", GC_OPT_FLAG_LIST, GC_LEVEL_ADVANCED,
-     "gnupg", N_("|SPEC|set up email aliases"),
-     GC_ARG_TYPE_ALIAS_LIST, GC_BACKEND_GPG },
-   { "options", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG },
-   { "compliance", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     NULL, NULL,
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
-   { "default-new-key-algo", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
-   { "default_pubkey_algo",
-     (GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_NO_CHANGE), GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
-   { "compliance_de_vs",
-     (GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_NO_CHANGE), GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
-   { "trust-model",
-     GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
-
-
-   { "Debug",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
-     "gnupg", N_("Options useful for debugging") },
-   { "debug-level", GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED,
-     "gnupg", "|LEVEL|set the debugging level to LEVEL",
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
-   { "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "gnupg", N_("|FILE|write server mode logs to FILE"),
-     GC_ARG_TYPE_FILENAME, GC_BACKEND_GPG },
-/*    { "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE, */
-/*      NULL, NULL, */
-/*      GC_ARG_TYPE_UINT32, GC_BACKEND_GPG }, */
-
-   { "Keyserver",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Configuration for Keyservers") },
-   { "keyserver", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     "gnupg", N_("|URL|use keyserver at URL"), /* Deprecated - use dirmngr */
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
-   { "allow-pka-lookup", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", N_("allow PKA lookups (DNS requests)"),
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
-   { "auto-key-locate", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "gnupg", N_("|MECHANISMS|use MECHANISMS to locate keys by mail address"),
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
-   { "auto-key-import", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", N_("import missing key from a signature"),
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
-   { "include-key-block", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", N_("include the public key in signatures"),
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
-   { "auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
-   { "no-auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
-   { "disable-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     "gnupg", N_("disable all access to the dirmngr"),
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
-   { "max-cert-depth",
-     GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG },
-   { "completes-needed",
-     GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG },
-   { "marginals-needed",
-     GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPG },
-
-
-   GC_OPTION_NULL
+  { NULL }
  };
-#endif /*BUILD_WITH_GPG*/
 
 
-#ifndef BUILD_WITH_GPGSM
-#define gc_options_gpgsm NULL
-#else
-/* The options of the GC_COMPONENT_GPGSM component.  */
-static gc_option_t gc_options_gpgsm[] =
- {
-   /* The configuration file to which we write the changes.  */
-   { GPGCONF_NAME"-"GPGSM_NAME".conf",
-     GC_OPT_FLAG_NONE, GC_LEVEL_INTERNAL,
-     NULL, NULL, GC_ARG_TYPE_FILENAME, GC_BACKEND_GPGSM },
-
-   { "Monitor",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Options controlling the diagnostic output") },
-   { "verbose", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
-     "gnupg", "verbose",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
-   { "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", "be somewhat more quiet",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
-   { "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
-
-   { "Configuration",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_EXPERT,
-     "gnupg", N_("Options controlling the configuration") },
-   { "default-key", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", N_("|NAME|use NAME as default secret key"),
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
-   { "encrypt-to", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", N_("|NAME|encrypt to user ID NAME as well"),
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
-   { "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     "gnupg", "|FILE|read options from FILE",
-     GC_ARG_TYPE_FILENAME, GC_BACKEND_GPGSM },
-   { "prefer-system-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "gnupg", "use system's dirmngr if available",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
-   { "disable-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     "gnupg", N_("disable all access to the dirmngr"),
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
-   { "p12-charset", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "gnupg", N_("|NAME|use encoding NAME for PKCS#12 passphrases"),
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
-   { "keyserver", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
-     "gnupg", N_("|SPEC|use this keyserver to lookup keys"),
-     GC_ARG_TYPE_LDAP_SERVER, GC_BACKEND_GPGSM },
-   { "default_pubkey_algo",
-     (GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_NO_CHANGE), GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
-   { "compliance", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     NULL, NULL,
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
-
-   { "Debug",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
-     "gnupg", N_("Options useful for debugging") },
-   { "debug-level", GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED,
-     "gnupg", "|LEVEL|set the debugging level to LEVEL",
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
-   { "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "gnupg", N_("|FILE|write server mode logs to FILE"),
-     GC_ARG_TYPE_FILENAME, GC_BACKEND_GPGSM },
-   { "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_UINT32, GC_BACKEND_GPGSM },
-
-   { "Security",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Options controlling the security") },
-   { "disable-crl-checks", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", "never consult a CRL",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
-   { "enable-crl-checks", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
-   { "disable-trusted-cert-crl-check", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     "gnupg", N_("do not check CRLs for root certificates"),
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
-   { "enable-ocsp", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "gnupg", "check validity using OCSP",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
-   { "include-certs", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     "gnupg", "|N|number of certificates to include",
-     GC_ARG_TYPE_INT32, GC_BACKEND_GPGSM },
-   { "disable-policy-checks", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "gnupg", "do not check certificate policies",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
-   { "auto-issuer-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", "fetch missing issuer certificates",
-     GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
-   { "cipher-algo", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "gnupg", "|NAME|use cipher algorithm NAME",
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
-
-   GC_OPTION_NULL
- };
-#endif /*BUILD_WITH_GPGSM*/
+
+/* Our main option info object.  We copy all required information from the
+ * gpgrt_opt_t items but convert the flags value to bit flags.  */
+struct gc_option_s
+{
+  const char *name;            /* The same as gpgrt_opt_t.long_opt.     */
+  const char *desc;            /* The same as gpgrt_opt_t.description.  */
 
+  unsigned int is_header:1;    /* This is a header item.   */
+  unsigned int is_list:1;      /* This is a list style option.  */
+  unsigned int opt_arg:1;      /* The option's argument is optional.    */
+  unsigned int runtime:1;      /* The option is runtime changeable.  */
 
-#ifndef BUILD_WITH_DIRMNGR
-#define gc_options_dirmngr NULL
-#else
-/* The options of the GC_COMPONENT_DIRMNGR component.  */
-static gc_option_t gc_options_dirmngr[] =
- {
-   /* The configuration file to which we write the changes.  */
-   { GPGCONF_NAME"-"DIRMNGR_NAME".conf",
-     GC_OPT_FLAG_NONE, GC_LEVEL_INTERNAL,
-     NULL, NULL, GC_ARG_TYPE_FILENAME, GC_BACKEND_DIRMNGR },
-
-   { "Monitor",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Options controlling the diagnostic output") },
-   { "verbose", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
-     "dirmngr", "verbose",
-     GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "dirmngr", "be somewhat more quiet",
-     GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-
-   { "Format",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Options controlling the format of the output") },
-   { "sh", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "dirmngr", "sh-style command output",
-     GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "csh", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "dirmngr", "csh-style command output",
-     GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-
-   { "Configuration",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_EXPERT,
-     "gnupg", N_("Options controlling the configuration") },
-   { "options", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
-     "dirmngr", "|FILE|read options from FILE",
-     GC_ARG_TYPE_FILENAME, GC_BACKEND_DIRMNGR },
-   { "resolver-timeout", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_INT32, GC_BACKEND_DIRMNGR },
-   { "nameserver", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
-
-   { "Debug",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
-     "gnupg", N_("Options useful for debugging") },
-   { "debug-level", GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED,
-     "dirmngr", "|LEVEL|set the debugging level to LEVEL",
-     GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
-   { "no-detach", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "dirmngr", "do not detach from the console",
-     GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "dirmngr", N_("|FILE|write server mode logs to FILE"),
-     GC_ARG_TYPE_FILENAME, GC_BACKEND_DIRMNGR },
-   { "debug-wait", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_UINT32, GC_BACKEND_DIRMNGR },
-   { "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
-     NULL, NULL,
-     GC_ARG_TYPE_UINT32, GC_BACKEND_DIRMNGR },
-
-   { "Enforcement",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Options controlling the interactivity and enforcement") },
-   { "batch", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "dirmngr", "run without asking a user",
-     GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "force", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "dirmngr", "force loading of outdated CRLs",
-     GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "allow-version-check", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "dirmngr", "allow online software version check",
-     GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-
-   { "Tor",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Options controlling the use of Tor") },
-   { "use-tor", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "dirmngr", "route all network traffic via TOR",
-      GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-
-   { "Keyserver",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Configuration for Keyservers") },
-   { "keyserver", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "gnupg", N_("|URL|use keyserver at URL"),
-     GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
-
-   { "HTTP",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
-     "gnupg", N_("Configuration for HTTP servers") },
-   { "disable-http", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "dirmngr", "inhibit the use of HTTP",
-      GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "ignore-http-dp", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "dirmngr", "ignore HTTP CRL distribution points",
-      GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "dirmngr", "|URL|redirect all HTTP requests to URL",
-     GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
-   { "honor-http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "gnupg", N_("use system's HTTP proxy setting"),
-     GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-
-   { "LDAP",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,
-     "gnupg", N_("Configuration of LDAP servers to use") },
-   { "disable-ldap", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "dirmngr", "inhibit the use of LDAP",
-      GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "ignore-ldap-dp", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "dirmngr", "ignore LDAP CRL distribution points",
-      GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "ldap-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "dirmngr", "|HOST|use HOST for LDAP queries",
-     GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
-   { "only-ldap-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "dirmngr", "do not use fallback hosts with --ldap-proxy",
-      GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "add-servers", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "dirmngr", "add new servers discovered in CRL distribution points"
-     " to serverlist", GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "ldaptimeout", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "dirmngr", "|N|set LDAP timeout to N seconds",
-     GC_ARG_TYPE_UINT32, GC_BACKEND_DIRMNGR },
-   /* The following entry must not be removed, as it is required for
-      the GC_BACKEND_DIRMNGR_LDAP_SERVER_LIST.  */
-   { "ldapserverlist-file",
-     GC_OPT_FLAG_NONE, GC_LEVEL_INTERNAL,
-     "dirmngr", "|FILE|read LDAP server list from FILE",
-     GC_ARG_TYPE_FILENAME, GC_BACKEND_DIRMNGR },
-   /* This entry must come after at least one entry for
-      GC_BACKEND_DIRMNGR in this component, so that the entry for
-      "ldapserverlist-file will be initialized before this one.  */
-   { "LDAP Server", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
-     "gnupg", N_("LDAP server list"),
-     GC_ARG_TYPE_LDAP_SERVER, GC_BACKEND_DIRMNGR_LDAP_SERVER_LIST },
-   { "max-replies", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "dirmngr", "|N|do not return more than N items in one query",
-     GC_ARG_TYPE_UINT32, GC_BACKEND_DIRMNGR },
-
-   { "OCSP",
-     GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
-     "gnupg", N_("Configuration for OCSP") },
-   { "allow-ocsp", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC,
-     "dirmngr", "allow sending OCSP requests",
-     GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "ignore-ocsp-service-url", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "dirmngr", "ignore certificate contained OCSP service URLs",
-      GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR },
-   { "ocsp-responder", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "dirmngr", "|URL|use OCSP responder at URL",
-     GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
-   { "ocsp-signer", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
-     "dirmngr", "|FPR|OCSP response signed by FPR",
-     GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
-
-
-   GC_OPTION_NULL
- };
-#endif /*BUILD_WITH_DIRMNGR*/
+  unsigned int gpgconf_list:1; /* Has been announced in gpgconf-list.  */
 
+  unsigned int has_default:1;  /* The option has a default value.  */
+  unsigned int def_in_desc:1;  /* The default is in the descrition.  */
+  unsigned int no_arg_desc:1;  /* The argument has a default  ???.  */
+  unsigned int no_change:1;    /* User shall not change the option.   */
 
-/* The options of the GC_COMPONENT_PINENTRY component.  */
-static gc_option_t gc_options_pinentry[] =
- {
-   /* A dummy option to allow gc_component_list_components to find the
-      pinentry backend.  Needs to be a conf file. */
-   { GPGCONF_NAME"-pinentry.conf",
-     GC_OPT_FLAG_NONE, GC_LEVEL_INTERNAL,
-     NULL, NULL, GC_ARG_TYPE_FILENAME, GC_BACKEND_PINENTRY },
+  unsigned int attr_ignore:1;  /* The ARGPARSE_ATTR_IGNORE.  */
+  unsigned int attr_force:1;   /* The ARGPARSE_ATTR_FORCE.  */
 
-   GC_OPTION_NULL
- };
+  /* The expert level - copied from known_options.  */
+  gc_expert_level_t level;
+
+  /* The complex type - copied from known_options.  */
+  gc_arg_type_t arg_type;
+
+  /* The default value for this option.  This is NULL if the option is
+     not present in the component, the empty string if no default is
+     available, and otherwise a quoted string.  This is currently
+     malloced.*/
+  char *default_value;
+
+  /* The current value of this option. */
+  char *value;
+
+  /* The new flags for this option.  The only defined flag is actually
+     GC_OPT_FLAG_DEFAULT, and it means that the option should be
+     deleted.  In this case, NEW_VALUE is NULL.  */
+  unsigned long new_flags;
+
+  /* The new value of this option.  */
+  char *new_value;
+};
+typedef struct gc_option_s gc_option_t;
 
 
 
 /* The information associated with each component.  */
-static const struct
+static struct
 {
-  /* The name of this component.  Must not contain a colon (':')
-     character.  */
+  /* The name of the component.  Some components don't have an
+   * associated program, but are implemented directly by GPGConf.  In
+   * this case, PROGRAM is NULL.  */
+  char *program;
+
+  /* The displayed name of this component.  Must not contain a colon
+   * (':') character.  */
   const char *name;
 
   /* The gettext domain for the description DESC.  If this is NULL,
      then the description is not translated.  */
   const char *desc_domain;
 
-  /* The description for this domain.  */
+  /* The description of this component.  */
   const char *desc;
 
-  /* The list of options for this component, terminated by
-     GC_OPTION_NULL.  */
+  /* The module name (GNUPG_MODULE_NAME_foo) as defined by
+   * ../common/util.h.  This value is used to get the actual installed
+   * path of the program.  0 is used if no program for the component
+   * is available. */
+  char module_name;
+
+  /* The name for the configuration filename of this component.  */
+  const char *option_config_filename;
+
+  /* The static table of known options for this component.  */
+  known_option_t *known_options;
+
+  /* The static table of known pseudo options for this component or NULL.  */
+  const char **known_pseudo_options;
+
+  /* The runtime change callback.  If KILLFLAG is true the component
+     is killed and not just reloaded.  */
+  void (*runtime_change) (int killflag);
+
+  /* The table of known options as read from the component including
+   * header lines and such.  This is suitable to be passed to
+   * gpgrt_argparser.  Will be filled in by
+   * retrieve_options_from_program. */
+  gnupg_opt_t *opt_table;
+
+  /* The full table including data from OPT_TABLE.  The end of the
+   * table is marked by NULL entry for NAME.  Will be filled in by
+   * retrieve_options_from_program.  */
   gc_option_t *options;
-} gc_component[] =
+
+} gc_component[GC_COMPONENT_NR] =
   {
-    { "gpg",      "gnupg", N_("OpenPGP"), gc_options_gpg },
-    { "gpg-agent","gnupg", N_("Private Keys"), gc_options_gpg_agent },
-    { "scdaemon", "gnupg", N_("Smartcards"), gc_options_scdaemon },
-    { "gpgsm",    "gnupg", N_("S/MIME"), gc_options_gpgsm },
-    { "dirmngr",  "gnupg", N_("Network"), gc_options_dirmngr },
-    { "pinentry", "gnupg", N_("Passphrase Entry"), gc_options_pinentry }
+   /* Note: The order of the items must match the order given in the
+    * gc_component_id_t enumeration.  The order is often used by
+    * frontends to display the backend options thus do not change the
+    * order without considering the user experience.  */
+   { NULL },   /* DUMMY for GC_COMPONENT_ANY */
+
+   { GPG_NAME,  GPG_DISP_NAME,     "gnupg",  N_("OpenPGP"),
+     GNUPG_MODULE_NAME_GPG, GPG_NAME ".conf",
+     known_options_gpg, known_pseudo_options_gpg },
+
+   { GPGSM_NAME, GPGSM_DISP_NAME,  "gnupg",  N_("S/MIME"),
+     GNUPG_MODULE_NAME_GPGSM, GPGSM_NAME ".conf",
+     known_options_gpgsm, known_pseudo_options_gpgsm },
+
+   { GPG_AGENT_NAME, GPG_AGENT_DISP_NAME, "gnupg", N_("Private Keys"),
+     GNUPG_MODULE_NAME_AGENT, GPG_AGENT_NAME ".conf",
+     known_options_gpg_agent, NULL, gpg_agent_runtime_change },
+
+   { SCDAEMON_NAME, SCDAEMON_DISP_NAME, "gnupg", N_("Smartcards"),
+     GNUPG_MODULE_NAME_SCDAEMON, SCDAEMON_NAME ".conf",
+     known_options_scdaemon, NULL, scdaemon_runtime_change},
+
+   { DIRMNGR_NAME, DIRMNGR_DISP_NAME, "gnupg",   N_("Network"),
+     GNUPG_MODULE_NAME_DIRMNGR, DIRMNGR_NAME ".conf",
+     known_options_dirmngr, NULL, dirmngr_runtime_change },
+
+   { "pinentry", "Pinentry", "gnupg", N_("Passphrase Entry"),
+     GNUPG_MODULE_NAME_PINENTRY, NULL,
+     known_options_pinentry }
   };
 
 
 
-/* Structure used to collect error output of the backend programs.  */
+/* Structure used to collect error output of the component programs.  */
 struct error_line_s;
 typedef struct error_line_s *error_line_t;
 struct error_line_s
@@ -1156,7 +700,6 @@ gpg_agent_runtime_change (int killflag)
   const char *pgmname;
   const char *argv[5];
   pid_t pid = (pid_t)(-1);
-  char *abs_homedir = NULL;
   int i = 0;
 
   pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
@@ -1177,7 +720,6 @@ gpg_agent_runtime_change (int killflag)
     gc_error (0, 0, "error running '%s %s': %s",
               pgmname, argv[1], gpg_strerror (err));
   gnupg_release_process (pid);
-  xfree (abs_homedir);
 }
 
 
@@ -1188,7 +730,6 @@ scdaemon_runtime_change (int killflag)
   const char *pgmname;
   const char *argv[9];
   pid_t pid = (pid_t)(-1);
-  char *abs_homedir = NULL;
   int i = 0;
 
   (void)killflag;  /* For scdaemon kill and reload are synonyms.  */
@@ -1220,7 +761,6 @@ scdaemon_runtime_change (int killflag)
     gc_error (0, 0, "error running '%s %s': %s",
               pgmname, argv[4], gpg_strerror (err));
   gnupg_release_process (pid);
-  xfree (abs_homedir);
 }
 
 
@@ -1320,79 +860,44 @@ gc_component_launch (int component)
 }
 
 
-/* Unconditionally restart COMPONENT.  */
-void
-gc_component_kill (int component)
+static void
+do_runtime_change (int component, int killflag)
 {
-  int runtime[GC_BACKEND_NR];
-  gc_option_t *option;
-  gc_backend_t backend;
-
-  /* Set a flag for the backends to be reloaded.  */
-  for (backend = 0; backend < GC_BACKEND_NR; backend++)
-    runtime[backend] = 0;
+  int runtime[GC_COMPONENT_NR] =  { 0 };
 
   if (component < 0)
     {
       for (component = 0; component < GC_COMPONENT_NR; component++)
-        {
-          option = gc_component[component].options;
-          for (; option && option->name; option++)
-            runtime[option->backend] = 1;
-        }
+        runtime [component] = 1;
     }
   else
     {
-      assert (component < GC_COMPONENT_NR);
-      option = gc_component[component].options;
-      for (; option && option->name; option++)
-        runtime[option->backend] = 1;
+      log_assert (component >= 0 && component < GC_COMPONENT_NR);
+      runtime [component] = 1;
     }
 
-  /* Do the restart for the selected backends.  */
-  for (backend = GC_BACKEND_NR-1; backend; backend--)
+  /* Do the restart for the selected components.  */
+  for (component = GC_COMPONENT_NR-1; component >= 0; component--)
     {
-      if (runtime[backend] && gc_backend[backend].runtime_change)
-        (*gc_backend[backend].runtime_change) (1);
+      if (runtime[component] && gc_component[component].runtime_change)
+        (*gc_component[component].runtime_change) (killflag);
     }
 }
 
 
-/* Unconditionally reload COMPONENT or all components if COMPONENT is -1.  */
+/* Unconditionally restart COMPONENT.  */
 void
-gc_component_reload (int component)
+gc_component_kill (int component)
 {
-  int runtime[GC_BACKEND_NR];
-  gc_option_t *option;
-  gc_backend_t backend;
-
-  /* Set a flag for the backends to be reloaded.  */
-  for (backend = 0; backend < GC_BACKEND_NR; backend++)
-    runtime[backend] = 0;
+  do_runtime_change (component, 1);
+}
 
-  if (component < 0)
-    {
-      for (component = 0; component < GC_COMPONENT_NR; component++)
-        {
-          option = gc_component[component].options;
-          for (; option && option->name; option++)
-            runtime[option->backend] = 1;
-        }
-    }
-  else
-    {
-      assert (component < GC_COMPONENT_NR);
-      option = gc_component[component].options;
-      for (; option && option->name; option++)
-        runtime[option->backend] = 1;
-    }
 
-  /* Do the reload for all selected backends.  */
-  for (backend = 0; backend < GC_BACKEND_NR; backend++)
-    {
-      if (runtime[backend] && gc_backend[backend].runtime_change)
-        (*gc_backend[backend].runtime_change) (0);
-    }
+/* Unconditionally reload COMPONENT or all components if COMPONENT is -1.  */
+void
+gc_component_reload (int component)
+{
+  do_runtime_change (component, 0);
 }
 
 
@@ -1568,44 +1073,24 @@ percent_deescape (const char *src)
 void
 gc_component_list_components (estream_t out)
 {
-  gc_component_t component;
-  gc_option_t *option;
-  gc_backend_t backend;
-  int backend_seen[GC_BACKEND_NR];
+  gc_component_id_t component;
   const char *desc;
   const char *pgmname;
 
   for (component = 0; component < GC_COMPONENT_NR; component++)
     {
-      option = gc_component[component].options;
-      if (option)
-        {
-          for (backend = 0; backend < GC_BACKEND_NR; backend++)
-            backend_seen[backend] = 0;
-
-          pgmname = "";
-          for (; option && option->name; option++)
-            {
-              if ((option->flags & GC_OPT_FLAG_GROUP))
-                continue;
-              backend = option->backend;
-              if (backend_seen[backend])
-                continue;
-              backend_seen[backend] = 1;
-              assert (backend != GC_BACKEND_ANY);
-              if (gc_backend[backend].program
-                  && !gc_backend[backend].module_name)
-                continue;
-              pgmname = gnupg_module_name (gc_backend[backend].module_name);
-              break;
-            }
+      if (!gc_component[component].program)
+        continue;
+      if (gc_component[component].module_name)
+        pgmname = gnupg_module_name (gc_component[component].module_name);
+      else
+        pgmname = "";
 
-          desc = gc_component[component].desc;
-          desc = my_dgettext (gc_component[component].desc_domain, desc);
-          es_fprintf (out, "%s:%s:",
-                      gc_component[component].name,  gc_percent_escape (desc));
-          es_fprintf (out, "%s\n",  gc_percent_escape (pgmname));
-        }
+      desc = gc_component[component].desc;
+      desc = my_dgettext (gc_component[component].desc_domain, desc);
+      es_fprintf (out, "%s:%s:",
+                  gc_component[component].program, gc_percent_escape (desc));
+      es_fprintf (out, "%s\n",  gc_percent_escape (pgmname));
     }
 }
 
@@ -1712,9 +1197,6 @@ gc_component_check_options (int component, estream_t out, const char *conf_file)
 {
   gpg_error_t err;
   unsigned int result;
-  int backend_seen[GC_BACKEND_NR];
-  gc_backend_t backend;
-  gc_option_t *option;
   const char *pgmname;
   const char *argv[6];
   int i;
@@ -1723,35 +1205,17 @@ gc_component_check_options (int component, estream_t out, const char *conf_file)
   estream_t errfp;
   error_line_t errlines;
 
-  for (backend = 0; backend < GC_BACKEND_NR; backend++)
-    backend_seen[backend] = 0;
+  log_assert (component >= 0 && component < GC_COMPONENT_NR);
 
-  option = gc_component[component].options;
-  for (; option && option->name; option++)
-    {
-      if ((option->flags & GC_OPT_FLAG_GROUP))
-	continue;
-      backend = option->backend;
-      if (backend_seen[backend])
-	continue;
-      backend_seen[backend] = 1;
-      assert (backend != GC_BACKEND_ANY);
-      if (!gc_backend[backend].program)
-	continue;
-      if (!gc_backend[backend].module_name)
-	continue;
-
-      break;
-    }
-  if (! option || ! option->name)
+  if (!gc_component[component].program)
+    return 0;
+  if (!gc_component[component].module_name)
     return 0;
 
-  pgmname = gnupg_module_name (gc_backend[backend].module_name);
+  pgmname = gnupg_module_name (gc_component[component].module_name);
   i = 0;
   if (!gnupg_default_homedir_p ()
-      && backend != GC_BACKEND_ANY
-      && backend != GC_BACKEND_DIRMNGR_LDAP_SERVER_LIST
-      && backend != GC_BACKEND_PINENTRY)
+      && component != GC_COMPONENT_PINENTRY)
     {
       argv[i++] = "--homedir";
       argv[i++] = gnupg_homedir ();
@@ -1801,7 +1265,7 @@ gc_component_check_options (int component, estream_t out, const char *conf_file)
       desc = gc_component[component].desc;
       desc = my_dgettext (gc_component[component].desc_domain, desc);
       es_fprintf (out, "%s:%s:",
-                  gc_component[component].name, gc_percent_escape (desc));
+                  gc_component[component].program, gc_percent_escape (desc));
       es_fputs (gc_percent_escape (pgmname), out);
       es_fprintf (out, ":%d:%d:", !(result & 1), !(result & 2));
       for (errptr = errlines; errptr; errptr = errptr->next)
@@ -1836,7 +1300,7 @@ gc_component_check_options (int component, estream_t out, const char *conf_file)
 void
 gc_check_programs (estream_t out)
 {
-  gc_component_t component;
+  gc_component_id_t component;
 
   for (component = 0; component < GC_COMPONENT_NR; component++)
     gc_component_check_options (component, out, NULL);
@@ -1849,12 +1313,12 @@ gc_check_programs (estream_t out)
 int
 gc_component_find (const char *name)
 {
-  gc_component_t idx;
+  gc_component_id_t idx;
 
   for (idx = 0; idx < GC_COMPONENT_NR; idx++)
     {
-      if (gc_component[idx].options
-          && !strcmp (name, gc_component[idx].name))
+      if (gc_component[idx].program
+          && !strcmp (name, gc_component[idx].program))
 	return idx;
     }
   return -1;
@@ -1863,14 +1327,21 @@ gc_component_find (const char *name)
 
 /* List the option OPTION.  */
 static void
-list_one_option (const gc_option_t *option, estream_t out)
+list_one_option (gc_component_id_t component,
+                 const gc_option_t *option, estream_t out)
 {
   const char *desc = NULL;
   char *arg_name = NULL;
+  unsigned long flags;
+  const char *desc_domain = gc_component[component].desc_domain;
+
+  /* Don't show options with the ignore attribute.  */
+  if (option->attr_ignore && !option->attr_force)
+    return;
 
   if (option->desc)
     {
-      desc = my_dgettext (option->desc_domain, option->desc);
+      desc = my_dgettext (desc_domain, option->desc);
 
       if (*desc == '|')
 	{
@@ -1896,16 +1367,24 @@ list_one_option (const gc_option_t *option, estream_t out)
   es_fprintf (out, "%s", option->name);
 
   /* The flags field.  */
-  es_fprintf (out, ":%lu", option->flags);
+  flags = 0;
+  if (option->is_header)   flags |= GC_OPT_FLAG_GROUP;
+  if (option->is_list)     flags |= GC_OPT_FLAG_LIST;
+  if (option->runtime)     flags |= GC_OPT_FLAG_RUNTIME;
+  if (option->has_default) flags |= GC_OPT_FLAG_DEFAULT;
+  if (option->def_in_desc) flags |= GC_OPT_FLAG_DEF_DESC;
+  if (option->no_arg_desc) flags |= GC_OPT_FLAG_NO_ARG_DESC;
+  if (option->no_change)   flags |= GC_OPT_FLAG_NO_CHANGE;
+  if (option->attr_force)  flags |= GC_OPT_FLAG_NO_CHANGE;
+  es_fprintf (out, ":%lu", flags);
   if (opt.verbose)
     {
       es_putc (' ', out);
 
-      if (!option->flags)
+      if (!flags)
 	es_fprintf (out, "none");
       else
 	{
-	  unsigned long flags = option->flags;
 	  unsigned long flag = 0;
 	  unsigned long first = 1;
 
@@ -1951,16 +1430,17 @@ list_one_option (const gc_option_t *option, estream_t out)
   /* The default value field.  */
   es_fprintf (out, ":%s", option->default_value ? option->default_value : "");
 
-  /* The default argument field.  */
-  es_fprintf (out, ":%s", option->default_arg ? option->default_arg : "");
+  /* The default argument field.  This was never used and is thus empty.  */
+  es_fprintf (out, ":");
 
   /* The value field.  */
   if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_NONE
-      && (option->flags & GC_OPT_FLAG_LIST)
-      && option->value)
-    /* The special format "1,1,1,1,...,1" is converted to a number
-       here.  */
-    es_fprintf (out, ":%u", (unsigned int)((strlen (option->value) + 1) / 2));
+      && option->is_list && option->value)
+    {
+      /* The special format "1,1,1,1,...,1" is converted to a number
+         here.  */
+      es_fprintf (out, ":%u", (unsigned int)((strlen (option->value) + 1) / 2));
+    }
   else
     es_fprintf (out, ":%s", option->value ? option->value : "");
 
@@ -1976,17 +1456,14 @@ gc_component_list_options (int component, estream_t out)
 {
   const gc_option_t *option = gc_component[component].options;
 
-  while (option && option->name)
+  for ( ; option && option->name; option++)
     {
       /* Do not output unknown or internal options.  */
-      if (!(option->flags & GC_OPT_FLAG_GROUP)
-	  && (!option->active || option->level == GC_LEVEL_INTERNAL))
-	{
-	  option++;
+      if (!option->is_header
+	  && option->level == GC_LEVEL_INTERNAL)
 	  continue;
-	}
 
-      if (option->flags & GC_OPT_FLAG_GROUP)
+      if (option->is_header)
 	{
 	  const gc_option_t *group_option = option + 1;
 	  gc_expert_level_t level = GC_LEVEL_NR;
@@ -1997,13 +1474,12 @@ gc_component_list_options (int component, estream_t out)
 	     maintain manually, we calculate it here.  The value in
 	     the global static table is ignored.  */
 
-	  while (group_option->name)
+	  for ( ; group_option->name; group_option++)
 	    {
-	      if (group_option->flags & GC_OPT_FLAG_GROUP)
+	      if (group_option->is_header)
 		break;
 	      if (group_option->level < level)
 		level = group_option->level;
-	      group_option++;
 	    }
 
 	  /* Check if group is empty.  */
@@ -2012,88 +1488,100 @@ gc_component_list_options (int component, estream_t out)
 	      gc_option_t opt_copy;
 
 	      /* Fix up the group level.  */
-	      memcpy (&opt_copy, option, sizeof (opt_copy));
+	      opt_copy = *option;
 	      opt_copy.level = level;
-	      list_one_option (&opt_copy, out);
+	      list_one_option (component, &opt_copy, out);
 	    }
 	}
       else
-	list_one_option (option, out);
+	list_one_option (component, option, out);
+    }
+}
 
-      option++;
+
+/* Return true if the option NAME is known and that we want it as
+ * gpgconf managed option.  */
+static known_option_t *
+is_known_option (gc_component_id_t component, const char *name)
+{
+  known_option_t *option = gc_component[component].known_options;
+  if (option)
+    {
+      for (; option->name; option++)
+        if (!strcmp (option->name, name))
+          break;
     }
+  return (option && option->name)? option : NULL;
 }
 
 
-/* Find the option NAME in component COMPONENT, for the backend
-   BACKEND.  If BACKEND is GC_BACKEND_ANY, any backend will match.  */
+/* Find the option NAME in component COMPONENT.  Returns pointer to
+ * the option descriptor or NULL if not found.  */
 static gc_option_t *
-find_option (gc_component_t component, const char *name,
-	     gc_backend_t backend)
+find_option (gc_component_id_t component, const char *name)
 {
   gc_option_t *option = gc_component[component].options;
-  while (option->name)
+
+  if (option)
     {
-      if (!(option->flags & GC_OPT_FLAG_GROUP)
-	  && !strcmp (option->name, name)
-	  && (backend == GC_BACKEND_ANY || option->backend == backend))
-	break;
-      option++;
+      for (; option->name; option++)
+        {
+          if (!option->is_header
+              && !strcmp (option->name, name))
+            return option;
+        }
     }
-  return option->name ? option : NULL;
+  return NULL;
 }
 
+
 
-/* Determine the configuration filename for the component COMPONENT
-   and backend BACKEND.  */
-static char *
-get_config_filename (gc_component_t component, gc_backend_t backend)
+struct read_line_wrapper_parm_s
 {
-  char *filename = NULL;
-  gc_option_t *option = find_option
-    (component, gc_backend[backend].option_config_filename, GC_BACKEND_ANY);
-  assert (option);
-  assert (option->arg_type == GC_ARG_TYPE_FILENAME);
-  assert (!(option->flags & GC_OPT_FLAG_LIST));
-
-  if (!option->active || !option->default_value)
-    gc_error (1, 0, "Option %s, needed by backend %s, was not initialized",
-	      gc_backend[backend].option_config_filename,
-	      gc_backend[backend].name);
-
-  if (option->value && *option->value)
-    filename = percent_deescape (&option->value[1]);
-  else if (option->default_value && *option->default_value)
-    filename = percent_deescape (&option->default_value[1]);
-  else
-    filename = "";
-
-#if HAVE_W32CE_SYSTEM
-  if (!(filename[0] == '/' || filename[0] == '\\'))
-#elif defined(HAVE_DOSISH_SYSTEM)
-  if (!(filename[0]
-        && filename[1] == ':'
-        && (filename[2] == '/' || filename[2] == '\\')) /* x:\ or x:/ */
-      && !((filename[0] == '\\' && filename[1] == '\\')
-           || (filename[0] == '/' && filename[1] == '/'))) /* \\server */
-#else
-  if (filename[0] != '/')
-#endif
-    gc_error (1, 0, "Option %s, needed by backend %s, is not absolute",
-	      gc_backend[backend].option_config_filename,
-	      gc_backend[backend].name);
+  const char *pgmname;
+  estream_t fp;
+  char *line;
+  size_t line_len;
+  const char **extra_lines;
+  int extra_lines_idx;
+  char *extra_line_buffer;
+};
 
-  return filename;
+
+/* Helper for retrieve_options_from_program.  */
+static ssize_t
+read_line_wrapper (struct read_line_wrapper_parm_s *parm)
+{
+  ssize_t length;
+  const char *extra_line;
+
+  if (parm->fp)
+    {
+      length = es_read_line (parm->fp, &parm->line, &parm->line_len, NULL);
+      if (length > 0)
+        return length;
+      if (length < 0 || es_ferror (parm->fp))
+        gc_error (1, errno, "error reading from %s", parm->pgmname);
+      if (es_fclose (parm->fp))
+        gc_error (1, errno, "error closing %s", parm->pgmname);
+      /* EOF seen.  */
+      parm->fp = NULL;
+    }
+  /* Return the made up lines.  */
+  if (!parm->extra_lines
+      || !(extra_line = parm->extra_lines[parm->extra_lines_idx]))
+    return -1;  /* This is really the EOF.  */
+  parm->extra_lines_idx++;
+  xfree (parm->extra_line_buffer);
+  parm->extra_line_buffer = xstrdup (extra_line);
+  return strlen (parm->extra_line_buffer);
 }
 
-
-/* Retrieve the options for the component COMPONENT from backend
- * BACKEND, which we already know is a program-type backend.  With
+/* Retrieve the options for the component COMPONENT.  With
  * ONLY_INSTALLED set components which are not installed are silently
  * ignored. */
 static void
-retrieve_options_from_program (gc_component_t component, gc_backend_t backend,
-                               int only_installed)
+retrieve_options_from_program (gc_component_id_t component, int only_installed)
 {
   gpg_error_t err;
   const char *pgmname;
@@ -2101,33 +1589,216 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend,
   estream_t outfp;
   int exitcode;
   pid_t pid;
+  known_option_t *known_option;
+  gc_option_t *option;
   char *line = NULL;
-  size_t line_len = 0;
+  size_t line_len;
   ssize_t length;
-  estream_t config;
-  char *config_filename;
+  const char *config_name;
+  gnupg_argparse_t pargs;
+  int dummy_argc;
+  char *twopartconfig_name = NULL;
+  gnupg_opt_t *opt_table = NULL;      /* A malloced option table.    */
+  size_t opt_table_used = 0;          /* Its current length.         */
+  size_t opt_table_size = 0;          /* Its allocated length.       */
+  gc_option_t *opt_info = NULL;       /* A malloced options table.  */
+  size_t opt_info_used = 0;           /* Its current length.         */
+  size_t opt_info_size = 0;           /* Its allocated length.       */
   int i;
+  struct read_line_wrapper_parm_s read_line_parm;
+  int pseudo_count;
 
-  pgmname = (gc_backend[backend].module_name
-             ? gnupg_module_name (gc_backend[backend].module_name)
-             : gc_backend[backend].program );
-  i = 0;
-  if (!gnupg_default_homedir_p ()
-      && backend != GC_BACKEND_ANY
-      && backend != GC_BACKEND_DIRMNGR_LDAP_SERVER_LIST
-      && backend != GC_BACKEND_PINENTRY)
-    {
-      argv[i++] = "--homedir";
-      argv[i++] = gnupg_homedir ();
-    }
-  argv[i++] = "--gpgconf-list";
-  argv[i++] = NULL;
+  pgmname = (gc_component[component].module_name
+             ? gnupg_module_name (gc_component[component].module_name)
+             : gc_component[component].program );
 
   if (only_installed && gnupg_access (pgmname, X_OK))
     {
       return;  /* The component is not installed.  */
     }
 
+
+  /* First we need to read the option table from the program.  */
+  argv[0] = "--dump-option-table";
+  argv[1] = NULL;
+  err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
+                             NULL, &outfp, NULL, &pid);
+  if (err)
+    {
+      gc_error (1, 0, "could not gather option table from '%s': %s",
+                pgmname, gpg_strerror (err));
+    }
+
+  read_line_parm.pgmname = pgmname;
+  read_line_parm.fp = outfp;
+  read_line_parm.line = line;
+  read_line_parm.line_len = line_len = 0;
+  read_line_parm.extra_line_buffer = NULL;
+  read_line_parm.extra_lines = gc_component[component].known_pseudo_options;
+  read_line_parm.extra_lines_idx = 0;
+  pseudo_count = 0;
+  while ((length = read_line_wrapper (&read_line_parm)) > 0)
+    {
+      char *fields[4];
+      char *optname, *optdesc;
+      unsigned int optflags;
+      int short_opt;
+      gc_arg_type_t arg_type;
+      int pseudo = 0;
+
+      if (read_line_parm.extra_line_buffer)
+        {
+          line = read_line_parm.extra_line_buffer;
+          pseudo = 1;
+          pseudo_count++;
+        }
+      else
+        line = read_line_parm.line;
+
+      /* Strip newline and carriage return, if present.  */
+      while (length > 0
+	     && (line[length - 1] == '\n' || line[length - 1] == '\r'))
+	line[--length] = '\0';
+
+      if (split_fields_colon (line, fields, DIM (fields)) < 4)
+        {
+          gc_error (0,0, "WARNING: invalid line in option table of '%s'\n",
+                    pgmname);
+          continue;
+        }
+
+      optname = fields[0];
+      short_opt = atoi (fields[1]);
+      if (short_opt < 1 && !pseudo)
+        {
+          gc_error (0,0, "WARNING: bad short option in option table of '%s'\n",
+                    pgmname);
+          continue;
+        }
+
+      optflags = strtoul (fields[2], NULL, 10);
+      if ((optflags & ARGPARSE_OPT_HEADER))
+        known_option = NULL; /* We want all header-only options.  */
+      else if ((known_option = is_known_option (component, optname)))
+        ; /* Yes we want this one.  */
+      else
+        continue; /* No need to store this option description.  */
+
+      /* The +1 here is to make sure that we will have a zero item at
+       * the end of the table.  */
+      if (opt_table_used + 1 >= opt_table_size)
+        {
+          /* Note that this also does the initial allocation.  */
+          opt_table_size += 128;
+          opt_table = xreallocarray (opt_table,
+                                     opt_table_used,
+                                     opt_table_size,
+                                     sizeof *opt_table);
+        }
+      /* The +1 here is to make sure that we will have a zero item at
+       * the end of the table.  */
+      if (opt_info_used + 1 >= opt_info_size)
+        {
+          /* Note that this also does the initial allocation.  */
+          opt_info_size += 128;
+          opt_info = xreallocarray (opt_info,
+                                    opt_info_used,
+                                    opt_info_size,
+                                    sizeof *opt_info);
+        }
+       /* The +1 here accounts for the two items we are going to add to
+        * the global string table.  */
+      if (string_array_used + 1 >= string_array_size)
+        {
+          string_array_size += 256;
+          string_array = xreallocarray (string_array,
+                                        string_array_used,
+                                        string_array_size,
+                                        sizeof *string_array);
+        }
+      string_array[string_array_used++] = optname = xstrdup (fields[0]);
+      string_array[string_array_used++] = optdesc = xstrdup (fields[3]);
+
+      /* Create an option table which can then be supplied to
+       * gpgrt_parser.  Unfortunately there is no private pointer in
+       * the public option table struct so that we can't add extra
+       * data we need here.  Thus we need to build up another table
+       * for such info and for ease of use we also copy the tehre the
+       * data from the option table.  It is not possible to use the
+       * known_option_s for this because that one does not carry
+       * header lines and it might also be problematic to use such
+       * static tables for caching options and default values.  */
+      if (!pseudo)
+        {
+          opt_table[opt_table_used].long_opt = optname;
+          opt_table[opt_table_used].short_opt = short_opt;
+          opt_table[opt_table_used].description = optdesc;
+          opt_table[opt_table_used].flags = optflags;
+          opt_table_used++;
+        }
+
+      /* Note that as per argparser specs the opt_table uses "@" to
+       * specifify an empty description.  In the DESC script of
+       * options (opt_info_t) we want to have a real empty string.  */
+      opt_info[opt_info_used].name = optname;
+      if (*optdesc == '@' && !optdesc[1])
+        opt_info[opt_info_used].desc = optdesc+1;
+      else
+        opt_info[opt_info_used].desc = optdesc;
+
+      /* Unfortunately we need to remap the types.  */
+      switch ((optflags & ARGPARSE_TYPE_MASK))
+        {
+        case ARGPARSE_TYPE_INT:    arg_type = GC_ARG_TYPE_INT32;  break;
+        case ARGPARSE_TYPE_LONG:   arg_type = GC_ARG_TYPE_INT32;  break;
+        case ARGPARSE_TYPE_ULONG:  arg_type = GC_ARG_TYPE_UINT32; break;
+        case ARGPARSE_TYPE_STRING: arg_type = GC_ARG_TYPE_STRING; break;
+        default:                   arg_type = GC_ARG_TYPE_NONE;   break;
+        }
+      opt_info[opt_info_used].arg_type = arg_type;
+      if (pseudo) /* Pseudo options are always no_change.  */
+        opt_info[opt_info_used].no_change = 1;
+
+      if ((optflags & ARGPARSE_OPT_HEADER))
+        opt_info[opt_info_used].is_header = 1;
+      if (known_option)
+        {
+          if ((known_option->flags & GC_OPT_FLAG_LIST))
+            opt_info[opt_info_used].is_list = 1;
+          /* FIXME: The next can also be taken from opt_table->flags.
+           * We need to check the code whether both specifications match.  */
+          if ((known_option->flags & GC_OPT_FLAG_ARG_OPT))
+            opt_info[opt_info_used].opt_arg = 1;
+          /* Same here.  */
+          if ((known_option->flags & GC_OPT_FLAG_RUNTIME))
+            opt_info[opt_info_used].runtime = 1;
+
+          opt_info[opt_info_used].level = known_option->level;
+          /* Override the received argtype by a complex type.  */
+          if (known_option->arg_type)
+            opt_info[opt_info_used].arg_type = known_option->arg_type;
+        }
+      opt_info_used++;
+    }
+  xfree (read_line_parm.extra_line_buffer);
+  line = read_line_parm.line;
+  line_len = read_line_parm.line_len;
+  log_assert (opt_table_used + pseudo_count == opt_info_used);
+
+  err = gnupg_wait_process (pgmname, pid, 1, &exitcode);
+  if (err)
+    gc_error (1, 0, "running %s failed (exitcode=%d): %s",
+              pgmname, exitcode, gpg_strerror (err));
+  gnupg_release_process (pid);
+
+  /* Make the gpgrt option table and the internal option table available.  */
+  gc_component[component].opt_table = opt_table;
+  gc_component[component].options = opt_info;
+
+
+  /* Now read the default options.  */
+  argv[0] = "--gpgconf-list";
+  argv[1] = NULL;
   err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
                              NULL, &outfp, NULL, &pid);
   if (err)
@@ -2138,7 +1809,6 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend,
 
   while ((length = es_read_line (outfp, &line, &line_len, NULL)) > 0)
     {
-      gc_option_t *option;
       char *linep;
       unsigned long flags = 0;
       char *default_value = NULL;
@@ -2184,7 +1854,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend,
 	  if (end)
 	    *(end++) = '\0';
 
-	  if (flags & GC_OPT_FLAG_DEFAULT)
+	  if ((flags & GC_OPT_FLAG_DEFAULT))
 	    default_value = linep;
 
 	  linep = end;
@@ -2192,15 +1862,24 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend,
 
       /* Look up the option in the component and install the
 	 configuration data.  */
-      option = find_option (component, line, backend);
+      option = find_option (component, line);
       if (option)
 	{
-	  if (option->active)
-	    gc_error (1, errno, "option %s returned twice from %s",
+	  if (option->gpgconf_list)
+	    gc_error (1, errno,
+                      "option %s returned twice from \"%s --gpgconf-list\"",
 		      line, pgmname);
-	  option->active = 1;
+	  option->gpgconf_list = 1;
+
+          if ((flags & GC_OPT_FLAG_DEFAULT))
+            option->has_default = 1;
+          if ((flags & GC_OPT_FLAG_DEF_DESC))
+            option->def_in_desc = 1;
+          if ((flags & GC_OPT_FLAG_NO_ARG_DESC))
+            option->no_arg_desc = 1;
+          if ((flags & GC_OPT_FLAG_NO_CHANGE))
+            option->no_change = 1;
 
-	  option->flags |= flags;
 	  if (default_value && *default_value)
 	    option->default_value = xstrdup (default_value);
 	}
@@ -2218,204 +1897,127 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend,
 
 
   /* At this point, we can parse the configuration file.  */
-  config_filename = get_config_filename (component, backend);
+  config_name = gc_component[component].option_config_filename;
+  if (!config_name)
+    gc_error (1, 0, "name of config file for %s is not known\n", pgmname);
 
-  config = es_fopen (config_filename, "r");
-  if (!config)
-    {
-      if (errno != ENOENT)
-        gc_error (0, errno, "warning: can not open config file %s",
-                  config_filename);
-    }
-  else
+  if (!gnupg_default_homedir_p ())
     {
-      while ((length = es_read_line (config, &line, &line_len, NULL)) > 0)
-	{
-	  char *name;
-	  char *value;
-	  gc_option_t *option;
-
-	  name = line;
-	  while (*name == ' ' || *name == '\t')
-	    name++;
-	  if (!*name || *name == '#' || *name == '\r' || *name == '\n')
-	    continue;
-
-	  value = name;
-	  while (*value && *value != ' ' && *value != '\t'
-		 && *value != '#' && *value != '\r' && *value != '\n')
-	    value++;
-	  if (*value == ' ' || *value == '\t')
-	    {
-	      char *end;
-
-	      *(value++) = '\0';
-	      while (*value == ' ' || *value == '\t')
-		value++;
-
-	      end = value;
-	      while (*end && *end != '#' && *end != '\r' && *end != '\n')
-		end++;
-	      while (end > value && (end[-1] == ' ' || end[-1] == '\t'))
-		end--;
-	      *end = '\0';
-	    }
-	  else
-	    *value = '\0';
-
-	  /* Look up the option in the component and install the
-	     configuration data.  */
-	  option = find_option (component, line, backend);
-	  if (option)
-	    {
-	      char *opt_value;
-
-	      if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_NONE)
-		{
-		  if (*value)
-		    gc_error (0, 0,
-			      "warning: ignoring argument %s for option %s",
-			      value, name);
-		  opt_value = xstrdup ("1");
-		}
-	      else if (gc_arg_type[option->arg_type].fallback
-		       == GC_ARG_TYPE_STRING)
-		opt_value = xasprintf ("\"%s", gc_percent_escape (value));
-	      else
-		{
-		  /* FIXME: Verify that the number is sane.  */
-		  opt_value = xstrdup (value);
-		}
-
-	      /* Now enter the option into the table.  */
-	      if (!(option->flags & GC_OPT_FLAG_LIST))
-		{
-		  if (option->value)
-		    xfree (option->value);
-		  option->value = opt_value;
-		}
-	      else
-		{
-		  if (!option->value)
-		    option->value = opt_value;
-		  else
-		    {
-		      char *old = option->value;
-		      option->value = xasprintf ("%s,%s", old, opt_value);
-		      xfree (old);
-		      xfree (opt_value);
-		    }
-		}
-	    }
-	}
-
-      if (length < 0 || es_ferror (config))
-	gc_error (1, errno, "error reading from %s", config_filename);
-      if (es_fclose (config))
-	gc_error (1, errno, "error closing %s", config_filename);
-    }
-
-  xfree (line);
-}
-
-
-/* Retrieve the options for the component COMPONENT from backend
-   BACKEND, which we already know is of type file list.  */
-static void
-retrieve_options_from_file (gc_component_t component, gc_backend_t backend)
-{
-  gc_option_t *list_option;
-  gc_option_t *config_option;
-  char *list_filename;
-  gpgrt_stream_t list_file;
-  char *line = NULL;
-  size_t line_len = 0;
-  ssize_t length;
-  char *list = NULL;
-
-  list_option = find_option (component,
-			     gc_backend[backend].option_name, GC_BACKEND_ANY);
-  assert (list_option);
-  assert (!list_option->active);
+      /* This is not the default homedir.  We need to take an absolute
+       * config name for the user config file; gpgrt_argparser
+       * fortunately supports this.  */
+      char *tmp = make_filename (gnupg_homedir (), config_name, NULL);
+      twopartconfig_name = xstrconcat (config_name, PATHSEP_S, tmp, NULL);
+      xfree (tmp);
+      config_name = twopartconfig_name;
+    }
+
+  memset (&pargs, 0, sizeof pargs);
+  dummy_argc = 0;
+  pargs.argc = &dummy_argc;
+  pargs.flags = (ARGPARSE_FLAG_KEEP
+                 | ARGPARSE_FLAG_SYS
+                 | ARGPARSE_FLAG_USER
+                 | ARGPARSE_FLAG_WITHATTR);
+  if (opt.verbose)
+    pargs.flags |= ARGPARSE_FLAG_VERBOSE;
 
-  list_filename = get_config_filename (component, backend);
-  list_file = gpgrt_fopen (list_filename, "r");
-  if (!list_file)
-    gc_error (0, errno, "warning: can not open list file %s", list_filename);
-  else
+  while (gnupg_argparser (&pargs, opt_table, config_name))
     {
+      char *opt_value;
 
-      while ((length = gpgrt_read_line (list_file, &line, &line_len, NULL)) > 0)
-	{
-	  char *start;
-	  char *end;
-	  char *new_list;
+      if (pargs.r_opt == ARGPARSE_CONFFILE)
+        {
+          /* log_debug ("current conffile='%s'\n", */
+          /*            pargs.r_type? pargs.r.ret_str: "[cmdline]"); */
+          continue;
+        }
+      if ((pargs.r_type & ARGPARSE_OPT_IGNORE))
+        continue;
 
-	  start = line;
-	  while (*start == ' ' || *start == '\t')
-	    start++;
-	  if (!*start || *start == '#' || *start == '\r' || *start == '\n')
-	    continue;
-
-	  end = start;
-	  while (*end && *end != '#' && *end != '\r' && *end != '\n')
-	    end++;
-	  /* Walk back to skip trailing white spaces.  Looks evil, but
-	     works because of the conditions on START and END imposed
-	     at this point (END is at least START + 1, and START is
-	     not a whitespace character).  */
-	  while (*(end - 1) == ' ' || *(end - 1) == '\t')
-	    end--;
-	  *end = '\0';
-	  /* FIXME: Oh, no!  This is so lame!  Should use realloc and
-	     really append.  */
-	  if (list)
-	    {
-	      new_list = xasprintf ("%s,\"%s", list, gc_percent_escape (start));
-	      xfree (list);
-	      list = new_list;
-	    }
-	  else
-	    list = xasprintf ("\"%s", gc_percent_escape (start));
-	}
-      if (length < 0 || gpgrt_ferror (list_file))
-	gc_error (1, errno, "can not read list file %s", list_filename);
-    }
+      /* We only have the short option.  Search in the option table
+       * for the long option name.  */
+      for (i=0; opt_table[i].short_opt; i++)
+        if (opt_table[i].short_opt == pargs.r_opt)
+          break;
+      if (!opt_table[i].short_opt || !opt_table[i].long_opt)
+        continue;  /* No or only a short option - ignore.  */
+
+      /* Look up the option from the config file in our list of
+       * supported options.  */
+      option= find_option (component, opt_table[i].long_opt);
+      if (!option)
+        continue;  /* We don't want to handle this option.  */
+
+      /* Set the force and ignore attributes.  The idea is that there
+       * is no way to clear them again, thus we set them when first
+       * encountered.  */
+      if ((pargs.r_type & ARGPARSE_ATTR_FORCE))
+        option->attr_force  = 1;
+      if ((pargs.r_type & ARGPARSE_ATTR_IGNORE))
+        option->attr_ignore = 1;
+
+      /* If an option has been ignored, there is no need to return
+       * that option with gpgconf --list-options.  */
+      if (option->attr_ignore)
+        continue;
 
-  list_option->active = 1;
-  list_option->value = list;
+      switch ((pargs.r_type & ARGPARSE_TYPE_MASK))
+        {
+        case ARGPARSE_TYPE_INT:
+          opt_value = xasprintf ("%d", pargs.r.ret_int);
+          break;
+        case ARGPARSE_TYPE_LONG:
+          opt_value = xasprintf ("%ld", pargs.r.ret_long);
+          break;
+        case ARGPARSE_TYPE_ULONG:
+          opt_value = xasprintf ("%lu", pargs.r.ret_ulong);
+          break;
+        case ARGPARSE_TYPE_STRING:
+          if (!pargs.r.ret_str)
+            opt_value = xstrdup ("\"(none)"); /* We should not see this.  */
+          else
+            opt_value = xasprintf ("\"%s", gc_percent_escape (pargs.r.ret_str));
+          break;
+        default: /* ARGPARSE_TYPE_NONE or any unknown type.  */
+          opt_value = xstrdup ("1");  /* Make sure we have some value.  */
+          break;
+        }
 
-  /* Fix up the read-only flag.  */
-  config_option = find_option
-    (component, gc_backend[backend].option_config_filename, GC_BACKEND_ANY);
-  if (config_option->flags & GC_OPT_FLAG_NO_CHANGE)
-    list_option->flags |= GC_OPT_FLAG_NO_CHANGE;
+      /* Now enter the value read from the config file into the table.  */
+      if (!option->is_list)
+        {
+          xfree (option->value);
+          option->value = opt_value;
+        }
+      else if (!option->value)  /* LIST but first item.  */
+        option->value = opt_value;
+      else
+        {
+          char *old = option->value;
+          option->value = xstrconcat (old, ",", opt_value, NULL);
+          xfree (old);
+          xfree (opt_value);
+        }
+    }
 
-  if (list_file && gpgrt_fclose (list_file))
-    gc_error (1, errno, "error closing %s", list_filename);
   xfree (line);
+  xfree (twopartconfig_name);
 }
 
 
-/* Retrieve the currently active options and their defaults from all
-   involved backends for this component.  Using -1 for component will
-   retrieve all options from all installed components. */
+/* Retrieve the currently active options and their defaults for this
+   component.  Using -1 for component will retrieve all options from
+   all installed components. */
 void
 gc_component_retrieve_options (int component)
 {
   int process_all = 0;
-  int backend_seen[GC_BACKEND_NR];
-  gc_backend_t backend;
-  gc_option_t *option;
-
-  for (backend = 0; backend < GC_BACKEND_NR; backend++)
-    backend_seen[backend] = 0;
 
   if (component == -1)
     {
       process_all = 1;
       component = 0;
-      assert (component < GC_COMPONENT_NR);
     }
 
   do
@@ -2423,31 +2025,8 @@ gc_component_retrieve_options (int component)
       if (component == GC_COMPONENT_PINENTRY)
         continue; /* Skip this dummy component.  */
 
-      option = gc_component[component].options;
-
-      while (option && option->name)
-        {
-          if (!(option->flags & GC_OPT_FLAG_GROUP))
-            {
-              backend = option->backend;
-
-              if (backend_seen[backend])
-                {
-                  option++;
-                  continue;
-                }
-              backend_seen[backend] = 1;
-
-              assert (backend != GC_BACKEND_ANY);
-
-              if (gc_backend[backend].program)
-                retrieve_options_from_program (component, backend,
-                                               process_all);
-              else
-                retrieve_options_from_file (component, backend);
-            }
-          option++;
-        }
+      if (gc_component[component].program)
+        retrieve_options_from_program (component, process_all);
     }
   while (process_all && ++component < GC_COMPONENT_NR);
 
@@ -2460,15 +2039,14 @@ gc_component_retrieve_options (int component)
  * type GC_ARG_TYPE_NONE.  If VERBATIM is set the profile parsing mode
  * is used. */
 static void
-option_check_validity (gc_option_t *option, unsigned long flags,
+option_check_validity (gc_component_id_t component,
+                       gc_option_t *option, unsigned long flags,
 		       char *new_value, unsigned long *new_value_nr,
                        int verbatim)
 {
   char *arg;
 
-  if (!option->active)
-    gc_error (1, 0, "option %s not supported by backend %s",
-              option->name, gc_backend[option->backend].name);
+  (void)component;
 
   if (option->new_flags || option->new_value)
     gc_error (1, 0, "option %s already changed", option->name);
@@ -2497,7 +2075,7 @@ option_check_validity (gc_option_t *option, unsigned long flags,
 	gc_error (1, 0, "garbage after argument for option %s",
 		      option->name);
 
-      if (!(option->flags & GC_OPT_FLAG_LIST))
+      if (!option->is_list)
 	{
 	  if (*new_value_nr != 1)
 	    gc_error (1, 0, "argument for non-list option %s of type 0 "
@@ -2518,10 +2096,10 @@ option_check_validity (gc_option_t *option, unsigned long flags,
     {
       if (*arg == '\0' || (*arg == ',' && !verbatim))
 	{
-	  if (!(option->flags & GC_OPT_FLAG_ARG_OPT))
+	  if (!option->opt_arg)
 	    gc_error (1, 0, "argument required for option %s", option->name);
 
-	  if (*arg == ',' && !verbatim && !(option->flags & GC_OPT_FLAG_LIST))
+	  if (*arg == ',' && !verbatim && !option->is_list)
 	    gc_error (1, 0, "list found for non-list option %s", option->name);
 	}
       else if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_STRING)
@@ -2634,374 +2212,8 @@ copy_file (const char *src_name, const char *dst_name)
 #endif /* HAVE_W32_SYSTEM */
 
 
-/* Test whether the config filename stored at FNAMEP is in the global
- * config directory.  In this case change the filename to use the
- * standard filename of the homedir.  This shall be used before
- * writing a config file to cope wit the case of a missing user config
- * file name but an existsing global config file - this would
- * otherwise lead to an attempt to write to the global file (which
- * will be silently rejected due to insufficient permissions) and not
- * the creation of a new user config file.  */
-static void
-munge_config_filename (char **fnamep)
-{
-  char *fname = *fnamep;
-  char *p1;
-  int c, rc;
-
-  p1 = strrchr (fname, '/');
-#ifdef HAVE_W32_SYSTEM
-  {
-    char *p2 = strchr (fname, '\\');
-    if (!p1 && p2)
-      p1 = p2;
-    else if (p2 && p2 > p1)
-      p1 = p2;
-  }
-#endif
-  if (!p1 || !*p1)
-    return;  /* No directory part - strange but no need for acting.  */
-  c = *p1;
-  *p1 = 0;
-  rc = compare_filenames (fname, gnupg_sysconfdir ());
-  *p1 = c;
-  if (!rc && p1[1]) /* Sysconfdir - use homedir instead.  */
-    {
-      char *newfname = xstrconcat (gnupg_homedir (), p1, NULL);
-#ifdef HAVE_W32_SYSTEM
-      for (p1=newfname; *p1; p1++)
-        if (*p1 == '/')
-          *p1 = '\\';
-#endif
-      xfree (fname);
-      *fnamep = newfname;
-    }
-}
-
-
-/* Create and verify the new configuration file for the specified
- * backend and component.  Returns 0 on success and -1 on error.  This
- * function may store pointers to malloced strings in SRC_FILENAMEP,
- * DEST_FILENAMEP, and ORIG_FILENAMEP.  Those must be freed by the
- * caller.  The strings refer to three versions of the configuration
- * file:
- *
- * SRC_FILENAME:  The updated configuration is written to this file.
- * DEST_FILENAME: Name of the configuration file read by the
- *                component.
- * ORIG_FILENAME: A backup of the previous configuration file.
- *
- * To apply the configuration change, rename SRC_FILENAME to
- * DEST_FILENAME.  To revert to the previous configuration, rename
- * ORIG_FILENAME to DEST_FILENAME.  */
-static int
-change_options_file (gc_component_t component, gc_backend_t backend,
-		     char **src_filenamep, char **dest_filenamep,
-		     char **orig_filenamep)
-{
-  static const char marker[] = "###+++--- " GPGCONF_DISP_NAME " ---+++###";
-  /* True if we are within the marker in the config file.  */
-  int in_marker = 0;
-  gc_option_t *option;
-  char *line = NULL;
-  size_t line_len;
-  ssize_t length;
-  int res;
-  int fd;
-  gpgrt_stream_t src_file = NULL;
-  gpgrt_stream_t dest_file = NULL;
-  char *src_filename;
-  char *dest_filename;
-  char *orig_filename;
-  char *arg;
-  char *cur_arg = NULL;
-
-  option = find_option (component,
-			gc_backend[backend].option_name, GC_BACKEND_ANY);
-  assert (option);
-  assert (option->active);
-  assert (gc_arg_type[option->arg_type].fallback != GC_ARG_TYPE_NONE);
-
-  /* FIXME.  Throughout the function, do better error reporting.  */
-  /* Note that get_config_filename() calls percent_deescape(), so we
-     call this before processing the arguments.  */
-  dest_filename = xstrdup (get_config_filename (component, backend));
-  src_filename = xasprintf ("%s.%s.%i.new",
-                            dest_filename, GPGCONF_NAME, (int)getpid ());
-  orig_filename = xasprintf ("%s.%s.%i.bak",
-                             dest_filename, GPGCONF_NAME, (int)getpid ());
-
-  arg = option->new_value;
-  if (arg && arg[0] == '\0')
-    arg = NULL;
-  else if (arg)
-    {
-      char *end;
-
-      arg++;
-      end = strchr (arg, ',');
-      if (end)
-	*end = '\0';
-
-      cur_arg = percent_deescape (arg);
-      if (end)
-	{
-	  *end = ',';
-	  arg = end + 1;
-	}
-      else
-	arg = NULL;
-    }
-
-#ifdef HAVE_W32_SYSTEM
-  res = copy_file (dest_filename, orig_filename);
-#else
-  res = link (dest_filename, orig_filename);
-#endif
-  if (res < 0 && errno != ENOENT)
-    {
-      xfree (dest_filename);
-      xfree (src_filename);
-      xfree (orig_filename);
-      return -1;
-    }
-  if (res < 0)
-    {
-      xfree (orig_filename);
-      orig_filename = NULL;
-    }
-
-  /* We now initialize the return strings, so the caller can do the
-     cleanup for us.  */
-  *src_filenamep = src_filename;
-  *dest_filenamep = dest_filename;
-  *orig_filenamep = orig_filename;
-
-  /* Use open() so that we can use O_EXCL.  */
-  fd = open (src_filename, O_CREAT | O_EXCL | O_WRONLY, 0644);
-  if (fd < 0)
-    return -1;
-  src_file = gpgrt_fdopen (fd, "w");
-  res = errno;
-  if (!src_file)
-    {
-      gpg_err_set_errno (res);
-      return -1;
-    }
-
-  /* Only if ORIG_FILENAME is not NULL did the configuration file
-     exist already.  In this case, we will copy its content into the
-     new configuration file, changing it to our liking in the
-     process.  */
-  if (orig_filename)
-    {
-      dest_file = gpgrt_fopen (dest_filename, "r");
-      if (!dest_file)
-	goto change_file_one_err;
-
-      while ((length = gpgrt_read_line (dest_file, &line, &line_len, NULL)) > 0)
-	{
-	  int disable = 0;
-	  char *start;
-
-	  if (!strncmp (marker, line, sizeof (marker) - 1))
-	    {
-	      if (!in_marker)
-		in_marker = 1;
-	      else
-		break;
-	    }
-
-	  start = line;
-	  while (*start == ' ' || *start == '\t')
-	    start++;
-	  if (*start && *start != '\r' && *start != '\n' && *start != '#')
-	    {
-	      char *end;
-	      char *endp;
-	      char saved_end;
-
-	      endp = start;
-	      end = endp;
-
-	      /* Search for the end of the line.  */
-	      while (*endp && *endp != '#' && *endp != '\r' && *endp != '\n')
-		{
-		  endp++;
-		  if (*endp && *endp != ' ' && *endp != '\t'
-		      && *endp != '\r' && *endp != '\n' && *endp != '#')
-		    end = endp + 1;
-		}
-	      saved_end = *end;
-	      *end = '\0';
-
-	      if ((option->new_flags & GC_OPT_FLAG_DEFAULT)
-		  || !cur_arg || strcmp (start, cur_arg))
-		disable = 1;
-	      else
-		{
-		  /* Find next argument.  */
-		  if (arg)
-		    {
-		      char *arg_end;
-
-		      arg++;
-		      arg_end = strchr (arg, ',');
-		      if (arg_end)
-			*arg_end = '\0';
-
-		      cur_arg = percent_deescape (arg);
-		      if (arg_end)
-			{
-			  *arg_end = ',';
-			  arg = arg_end + 1;
-			}
-		      else
-			arg = NULL;
-		    }
-		  else
-		    cur_arg = NULL;
-		}
-
-	      *end = saved_end;
-	    }
-
-	  if (disable)
-	    {
-	      if (!in_marker)
-		{
-		  gpgrt_fprintf (src_file,
-			   "# %s disabled this option here at %s\n",
-			   GPGCONF_DISP_NAME, asctimestamp (gnupg_get_time ()));
-		  if (gpgrt_ferror (src_file))
-		    goto change_file_one_err;
-		  gpgrt_fprintf (src_file, "# %s", line);
-		  if (gpgrt_ferror (src_file))
-		    goto change_file_one_err;
-		}
-	    }
-	  else
-	    {
-	      gpgrt_fprintf (src_file, "%s", line);
-	      if (gpgrt_ferror (src_file))
-		goto change_file_one_err;
-	    }
-	}
-      if (length < 0 || gpgrt_ferror (dest_file))
-	goto change_file_one_err;
-    }
-
-  if (!in_marker)
-    {
-      /* There was no marker.  This is the first time we edit the
-	 file.  We add our own marker at the end of the file and
-	 proceed.  Note that we first write a newline, this guards us
-	 against files which lack the newline at the end of the last
-	 line, while it doesn't hurt us in all other cases.  */
-      gpgrt_fprintf (src_file, "\n%s\n", marker);
-      if (gpgrt_ferror (src_file))
-	goto change_file_one_err;
-    }
-
-  /* At this point, we have copied everything up to the end marker
-     into the new file, except for the arguments we are going to add.
-     Now, dump the new arguments and write the end marker, possibly
-     followed by the rest of the original file.  */
-  while (cur_arg)
-    {
-      gpgrt_fprintf (src_file, "%s\n", cur_arg);
-
-      /* Find next argument.  */
-      if (arg)
-	{
-	  char *end;
-
-	  arg++;
-	  end = strchr (arg, ',');
-	  if (end)
-	    *end = '\0';
-
-	  cur_arg = percent_deescape (arg);
-	  if (end)
-	    {
-	      *end = ',';
-	      arg = end + 1;
-	    }
-	  else
-	    arg = NULL;
-	}
-      else
-	cur_arg = NULL;
-    }
-
-  gpgrt_fprintf (src_file, "%s %s\n", marker, asctimestamp (gnupg_get_time ()));
-  if (gpgrt_ferror (src_file))
-    goto change_file_one_err;
-
-  if (!in_marker)
-    {
-      gpgrt_fprintf (src_file, "# %s edited this configuration file.\n",
-               GPGCONF_DISP_NAME);
-      if (gpgrt_ferror (src_file))
-	goto change_file_one_err;
-      gpgrt_fprintf (src_file, "# It will disable options before this marked "
-	       "block, but it will\n");
-      if (gpgrt_ferror (src_file))
-	goto change_file_one_err;
-      gpgrt_fprintf (src_file, "# never change anything below these lines.\n");
-      if (gpgrt_ferror (src_file))
-	goto change_file_one_err;
-    }
-  if (dest_file)
-    {
-      while ((length = gpgrt_read_line (dest_file, &line, &line_len, NULL)) > 0)
-	{
-	  gpgrt_fprintf (src_file, "%s", line);
-	  if (gpgrt_ferror (src_file))
-	    goto change_file_one_err;
-	}
-      if (length < 0 || gpgrt_ferror (dest_file))
-	goto change_file_one_err;
-    }
-  xfree (line);
-  line = NULL;
-
-  res = gpgrt_fclose (src_file);
-  if (res)
-    {
-      res = errno;
-      close (fd);
-      if (dest_file)
-	gpgrt_fclose (dest_file);
-      gpg_err_set_errno (res);
-      return -1;
-    }
-  close (fd);
-  if (dest_file)
-    {
-      res = gpgrt_fclose (dest_file);
-      if (res)
-	return -1;
-    }
-  return 0;
-
- change_file_one_err:
-  xfree (line);
-  res = errno;
-  if (src_file)
-    {
-      gpgrt_fclose (src_file);
-      close (fd);
-    }
-  if (dest_file)
-    gpgrt_fclose (dest_file);
-  gpg_err_set_errno (res);
-  return -1;
-}
-
-
 /* Create and verify the new configuration file for the specified
- * backend and component.  Returns 0 on success and -1 on error.  If
+ * component.  Returns 0 on success and -1 on error.  If
  * VERBATIM is set the profile mode is used.  This function may store
  * pointers to malloced strings in SRC_FILENAMEP, DEST_FILENAMEP, and
  * ORIG_FILENAMEP.  Those must be freed by the caller.  The strings
@@ -3016,7 +2228,7 @@ change_options_file (gc_component_t component, gc_backend_t backend,
  * DEST_FILENAME.  To revert to the previous configuration, rename
  * ORIG_FILENAME to DEST_FILENAME.  */
 static int
-change_options_program (gc_component_t component, gc_backend_t backend,
+change_options_program (gc_component_id_t component,
 			char **src_filenamep, char **dest_filenamep,
 			char **orig_filenamep,
                         int verbatim)
@@ -3038,9 +2250,15 @@ change_options_program (gc_component_t component, gc_backend_t backend,
   /* Special hack for gpg, see below.  */
   int utf8strings_seen = 0;
 
+
   /* FIXME.  Throughout the function, do better error reporting.  */
-  dest_filename = xstrdup (get_config_filename (component, backend));
-  munge_config_filename (&dest_filename);
+  if (!gc_component[component].option_config_filename)
+    gc_error (1, 0, "name of config file for %s is not known\n",
+              gc_component[component].name);
+
+  dest_filename = make_absfilename
+    (gnupg_homedir (), gc_component[component].option_config_filename, NULL);
+
   src_filename = xasprintf ("%s.%s.%i.new",
                             dest_filename, GPGCONF_NAME, (int)getpid ());
   orig_filename = xasprintf ("%s.%s.%i.bak",
@@ -3105,7 +2323,7 @@ change_options_program (gc_component_t component, gc_backend_t backend,
 	      else
 		break;
 	    }
-	  else if (backend == GC_BACKEND_GPG && in_marker
+	  else if (component == GC_COMPONENT_GPG && in_marker
 		   && ! strcmp ("utf8-strings\n", line))
 	    {
 	      /* Strip duplicated entries.  */
@@ -3130,7 +2348,7 @@ change_options_program (gc_component_t component, gc_backend_t backend,
 	      saved_end = *end;
 	      *end = '\0';
 
-	      option = find_option (component, start, backend);
+	      option = find_option (component, start);
 	      *end = saved_end;
 	      if (option && ((option->new_flags & GC_OPT_FLAG_DEFAULT)
 			     || option->new_value))
@@ -3179,15 +2397,13 @@ change_options_program (gc_component_t component, gc_backend_t backend,
      followed by the rest of the original file.  */
 
   /* We have to turn on UTF8 strings for GnuPG.  */
-  if (backend == GC_BACKEND_GPG && ! utf8strings_seen)
+  if (component == GC_COMPONENT_GPG && ! utf8strings_seen)
     gpgrt_fprintf (src_file, "utf8-strings\n");
 
   option = gc_component[component].options;
-  while (option->name)
+  for ( ; option->name; option++)
     {
-      if (!(option->flags & GC_OPT_FLAG_GROUP)
-	  && option->backend == backend
-	  && option->new_value)
+      if (!option->is_header && option->new_value)
 	{
 	  char *arg = option->new_value;
 
@@ -3202,7 +2418,7 @@ change_options_program (gc_component_t component, gc_backend_t backend,
 	      else if (gc_arg_type[option->arg_type].fallback
 		       == GC_ARG_TYPE_NONE)
 		{
-		  assert (*arg == '1');
+		  log_assert (*arg == '1');
 		  gpgrt_fprintf (src_file, "%s\n", option->name);
 		  if (gpgrt_ferror (src_file))
 		    goto change_one_err;
@@ -3252,13 +2468,12 @@ change_options_program (gc_component_t component, gc_backend_t backend,
 		  arg = end;
 		}
 
-	      assert (arg == NULL || *arg == '\0' || *arg == ',');
+	      log_assert (arg == NULL || *arg == '\0' || *arg == ',');
 	      if (arg && *arg == ',')
 		arg++;
 	    }
 	  while (arg && *arg);
 	}
-      option++;
     }
 
   gpgrt_fprintf (src_file, "%s %s\n", marker, asctimestamp (gnupg_get_time ()));
@@ -3331,27 +2546,29 @@ change_options_program (gc_component_t component, gc_backend_t backend,
  * gc_process_gpgconf_conf.  If VERBATIM is set the profile parsing
  * mode is used.  */
 static void
-change_one_value (gc_option_t *option, int *runtime,
+change_one_value (gc_component_id_t component,
+                  gc_option_t *option, int *r_runtime,
                   unsigned long flags, char *new_value, int verbatim)
 {
   unsigned long new_value_nr = 0;
 
-  option_check_validity (option, flags, new_value, &new_value_nr, verbatim);
+  option_check_validity (component, option,
+                         flags, new_value, &new_value_nr, verbatim);
 
-  if (option->flags & GC_OPT_FLAG_RUNTIME)
-    runtime[option->backend] = 1;
+  if (option->runtime)
+    *r_runtime = 1;
 
   option->new_flags = flags;
   if (!(flags & GC_OPT_FLAG_DEFAULT))
     {
       if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_NONE
-          && (option->flags & GC_OPT_FLAG_LIST))
+          && option->is_list)
         {
           char *str;
 
           /* We convert the number to a list of 1's for convenient
              list handling.  */
-          assert (new_value_nr > 0);
+          log_assert (new_value_nr > 0);
           option->new_value = xmalloc ((2 * (new_value_nr - 1) + 1) + 1);
           str = option->new_value;
           *(str++) = '1';
@@ -3377,11 +2594,10 @@ gc_component_change_options (int component, estream_t in, estream_t out,
 {
   int err = 0;
   int block = 0;
-  int runtime[GC_BACKEND_NR];
-  char *src_filename[GC_BACKEND_NR];
-  char *dest_filename[GC_BACKEND_NR];
-  char *orig_filename[GC_BACKEND_NR];
-  gc_backend_t backend;
+  int runtime = 0;
+  char *src_filename = NULL;
+  char *dest_filename = NULL;
+  char *orig_filename = NULL;
   gc_option_t *option;
   char *line = NULL;
   size_t line_len = 0;
@@ -3390,14 +2606,6 @@ gc_component_change_options (int component, estream_t in, estream_t out,
   if (component == GC_COMPONENT_PINENTRY)
     return; /* Dummy component for now.  */
 
-  for (backend = 0; backend < GC_BACKEND_NR; backend++)
-    {
-      runtime[backend] = 0;
-      src_filename[backend] = NULL;
-      dest_filename[backend] = NULL;
-      orig_filename[backend] = NULL;
-    }
-
   if (in)
     {
       /* Read options from the file IN.  */
@@ -3450,18 +2658,18 @@ gc_component_change_options (int component, estream_t in, estream_t out,
               linep = end;
             }
 
-          option = find_option (component, line, GC_BACKEND_ANY);
+          option = find_option (component, line);
           if (!option)
             gc_error (1, 0, "unknown option %s", line);
 
-          if ((option->flags & GC_OPT_FLAG_NO_CHANGE))
+          if (option->no_change)
             {
               gc_error (0, 0, "ignoring new value for option %s",
                         option->name);
               continue;
             }
 
-          change_one_value (option, runtime, flags, new_value, 0);
+          change_one_value (component, option, &runtime, flags, new_value, 0);
         }
       if (length < 0 || gpgrt_ferror (in))
 	gc_error (1, errno, "error reading stream 'in'");
@@ -3473,27 +2681,24 @@ gc_component_change_options (int component, estream_t in, estream_t out,
   option = gc_component[component].options;
   while (option && option->name)
     {
-      /* Go on if we have already seen this backend, or if there is
-	 nothing to do.  */
-      if (src_filename[option->backend]
-	  || !(option->new_flags || option->new_value))
+      /* Go on if there is nothing to do.  */
+      if (src_filename || !(option->new_flags || option->new_value))
 	{
 	  option++;
 	  continue;
 	}
 
-      if (gc_backend[option->backend].program)
+      if (gc_component[component].program)
 	{
-	  err = change_options_program (component, option->backend,
-					&src_filename[option->backend],
-					&dest_filename[option->backend],
-					&orig_filename[option->backend],
+	  err = change_options_program (component,
+					&src_filename,
+					&dest_filename,
+					&orig_filename,
                                         verbatim);
 	  if (! err)
 	    {
 	      /* External verification.  */
-	      err = gc_component_check_options (component, out,
-						src_filename[option->backend]);
+	      err = gc_component_check_options (component, out, src_filename);
 	      if (err)
 		{
 		  gc_error (0, 0,
@@ -3504,12 +2709,6 @@ gc_component_change_options (int component, estream_t in, estream_t out,
 	    }
 
 	}
-      else
-	err = change_options_file (component, option->backend,
-				   &src_filename[option->backend],
-				   &dest_filename[option->backend],
-				   &orig_filename[option->backend]);
-
       if (err)
 	break;
 
@@ -3524,70 +2723,62 @@ gc_component_change_options (int component, estream_t in, estream_t out,
   block = 1;
   gnupg_block_all_signals ();
 
-  if (! err && ! opt.dry_run)
+  if (!err && !opt.dry_run)
     {
-      int i;
-
-      for (i = 0; i < GC_BACKEND_NR; i++)
-	{
-	  if (src_filename[i])
-	    {
-	      /* FIXME: Make a verification here.  */
+      if (src_filename)
+        {
+          /* FIXME: Make a verification here.  */
 
-	      assert (dest_filename[i]);
+          log_assert (dest_filename);
 
-	      if (orig_filename[i])
-		err = gnupg_rename_file (src_filename[i], dest_filename[i], NULL);
-	      else
-		{
+          if (orig_filename)
+            err = gnupg_rename_file (src_filename, dest_filename, NULL);
+          else
+            {
 #ifdef HAVE_W32_SYSTEM
-		  /* We skip the unlink if we expect the file not to
-		     be there.  */
-                  err = gnupg_rename_file (src_filename[i], dest_filename[i], NULL);
+              /* We skip the unlink if we expect the file not to be
+               * there.  */
+              err = gnupg_rename_file (src_filename, dest_filename, NULL);
 #else /* HAVE_W32_SYSTEM */
-		  /* This is a bit safer than rename() because we
-		     expect DEST_FILENAME not to be there.  If it
-		     happens to be there, this will fail.  */
-		  err = link (src_filename[i], dest_filename[i]);
-		  if (!err)
-		    err = unlink (src_filename[i]);
+              /* This is a bit safer than rename() because we expect
+               * DEST_FILENAME not to be there.  If it happens to be
+               * there, this will fail.  */
+              err = link (src_filename, dest_filename);
+              if (!err)
+                err = unlink (src_filename);
 #endif /* !HAVE_W32_SYSTEM */
-		}
-	      if (err)
-		break;
-	      xfree (src_filename[i]);
-	      src_filename[i] = NULL;
-	    }
-	}
+            }
+          if (!err)
+            {
+              xfree (src_filename);
+              src_filename = NULL;
+            }
+        }
     }
 
   if (err || opt.dry_run)
     {
-      int i;
       int saved_errno = errno;
 
       /* An error occurred or a dry-run is requested.  */
-      for (i = 0; i < GC_BACKEND_NR; i++)
-	{
-	  if (src_filename[i])
-	    {
-	      /* The change was not yet committed.  */
-	      unlink (src_filename[i]);
-	      if (orig_filename[i])
-		unlink (orig_filename[i]);
-	    }
-	  else
-	    {
-	      /* The changes were already committed.  FIXME: This is a
-		 tad dangerous, as we don't know if we don't overwrite
-		 a version of the file that is even newer than the one
-		 we just installed.  */
-	      if (orig_filename[i])
-		gnupg_rename_file (orig_filename[i], dest_filename[i], NULL);
-	      else
-		unlink (dest_filename[i]);
-	    }
-	}
+      if (src_filename)
+        {
+          /* The change was not yet committed.  */
+          unlink (src_filename);
+          if (orig_filename)
+            unlink (orig_filename);
+        }
+      else
+        {
+          /* The changes were already committed.  FIXME: This is a tad
+             dangerous, as we don't know if we don't overwrite a
+             version of the file that is even newer than the one we
+             just installed.  */
+          if (orig_filename)
+            gnupg_rename_file (orig_filename, dest_filename, NULL);
+          else
+            unlink (dest_filename);
+        }
       if (err)
 	gc_error (1, saved_errno, "could not commit changes");
 
@@ -3597,36 +2788,28 @@ gc_component_change_options (int component, estream_t in, estream_t out,
 
   /* If it all worked, notify the daemons of the changes.  */
   if (opt.runtime)
-    for (backend = 0; backend < GC_BACKEND_NR; backend++)
-      {
-	if (runtime[backend] && gc_backend[backend].runtime_change)
-	  (*gc_backend[backend].runtime_change) (0);
-      }
+    do_runtime_change (component, 0);
 
-  /* Move the per-process backup file into its place.  */
-  for (backend = 0; backend < GC_BACKEND_NR; backend++)
-    if (orig_filename[backend])
-      {
-	char *backup_filename;
 
-	assert (dest_filename[backend]);
+  /* Move the per-process backup file into its place.  */
+  if (orig_filename)
+    {
+      char *backup_filename;
 
-	backup_filename = xasprintf ("%s.%s.bak",
-                                     dest_filename[backend], GPGCONF_NAME);
-	gnupg_rename_file (orig_filename[backend], backup_filename, NULL);
-	xfree (backup_filename);
-      }
+      log_assert (dest_filename);
+      backup_filename = xasprintf ("%s.%s.bak",
+                                   dest_filename, GPGCONF_NAME);
+      gnupg_rename_file (orig_filename, backup_filename, NULL);
+      xfree (backup_filename);
+    }
 
  leave:
   if (block)
     gnupg_unblock_all_signals ();
   xfree (line);
-  for (backend = 0; backend < GC_BACKEND_NR; backend++)
-    {
-      xfree (src_filename[backend]);
-      xfree (dest_filename[backend]);
-      xfree (orig_filename[backend]);
-    }
+  xfree (src_filename);
+  xfree (dest_filename);
+  xfree (orig_filename);
 }
 
 
@@ -3758,8 +2941,8 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
   int lineno = 0;
   int in_rule = 0;
   int got_match = 0;
-  int runtime[GC_BACKEND_NR];
-  int backend_id, component_id;
+  int runtime[GC_COMPONENT_NR] = { 0 };
+  int component_id;
   char *fname;
 
   if (fname_arg)
@@ -3768,9 +2951,6 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
     fname = make_filename (gnupg_sysconfdir (), GPGCONF_NAME EXTSEP_S "conf",
                            NULL);
 
-  for (backend_id = 0; backend_id < GC_BACKEND_NR; backend_id++)
-    runtime[backend_id] = 0;
-
   config = gpgrt_fopen (fname, "r");
   if (!config)
     {
@@ -3787,7 +2967,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
 
   while ((length = gpgrt_read_line (config, &line, &line_len, NULL)) > 0)
     {
-      char *key, *component, *option, *flags, *value;
+      char *key, *compname, *option, *flags, *value;
       char *empty;
       gc_option_t *option_info = NULL;
       char *p;
@@ -3821,7 +3001,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
               continue;
             }
           *p++ = 0;
-          component = p;
+          compname = p;
         }
       else if (!in_rule)
         {
@@ -3832,18 +3012,18 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
         }
       else
         {
-          component = key;
+          compname = key;
           key = NULL;
         }
 
       in_rule = 1;
 
       /* Parse the component.  */
-      while (*component == ' ' || *component == '\t')
-        component++;
-      for (p=component; *p && !strchr (" \t\r\n", *p); p++)
+      while (*compname == ' ' || *compname == '\t')
+        compname++;
+      for (p=compname; *p && !strchr (" \t\r\n", *p); p++)
         ;
-      if (p == component)
+      if (p == compname)
         {
           gc_error (0, 0, "missing component at '%s', line %d",
                     fname, lineno);
@@ -3857,7 +3037,7 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
       empty = p;
       *p++ = 0;
       option = p;
-      component_id = gc_component_find (component);
+      component_id = gc_component_find (compname);
       if (component_id < 0)
         {
           gc_error (0, 0, "unknown component at '%s', line %d",
@@ -3889,11 +3069,15 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
       flags = p;
       if ( component_id != -1)
         {
-          option_info = find_option (component_id, option, GC_BACKEND_ANY);
+          /* We need to make sure that we got the option list for the
+           * component.  */
+          if (!gc_component[component_id].options)
+            gc_component_retrieve_options (component_id);
+          option_info = find_option (component_id, option);
           if (!option_info)
             {
-              gc_error (0, 0, "unknown option at '%s', line %d",
-                        fname, lineno);
+              gc_error (0, 0, "unknown option '%s' at '%s', line %d",
+                        option, fname, lineno);
               gpgconf_write_status (STATUS_WARNING,
                                     "gpgconf.conf %d file '%s' line %d "
                                     "unknown option",
@@ -4014,9 +3198,9 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
           else if (!strcmp (flags, "default"))
             newflags |= GC_OPT_FLAG_DEFAULT;
           else if (!strcmp (flags, "no-change"))
-            option_info->flags |= GC_OPT_FLAG_NO_CHANGE;
+            option_info->no_change = 1;
           else if (!strcmp (flags, "change"))
-            option_info->flags &= ~GC_OPT_FLAG_NO_CHANGE;
+            option_info->no_change = 0;
 
           if (defaults)
             {
@@ -4030,7 +3214,8 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
                   xfree (option_info->new_value);
                   option_info->new_value = NULL;
                 }
-              change_one_value (option_info, runtime, newflags, value, 0);
+              change_one_value (component_id, option_info,
+                                runtime, newflags, value, 0);
             }
         }
     }
@@ -4061,9 +3246,10 @@ gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
 
       if (opt.runtime)
         {
-          for (backend_id = 0; backend_id < GC_BACKEND_NR; backend_id++)
-            if (runtime[backend_id] && gc_backend[backend_id].runtime_change)
-              (*gc_backend[backend_id].runtime_change) (0);
+          for (component_id = 0; component_id < GC_COMPONENT_NR; component_id++)
+            if (runtime[component_id]
+                && gc_component[component_id].runtime_change)
+              (*gc_component[component_id].runtime_change) (0);
         }
     }
 
@@ -4085,8 +3271,7 @@ gc_apply_profile (const char *fname)
   ssize_t length;
   estream_t fp;
   int lineno = 0;
-  int runtime[GC_BACKEND_NR];
-  int backend_id;
+  int runtime[GC_COMPONENT_NR] =  { 0 };
   int component_id = -1;
   int skip_section = 0;
   int error_count = 0;
@@ -4095,9 +3280,6 @@ gc_apply_profile (const char *fname)
   if (!fname)
     fname = "-";
 
-  for (backend_id = 0; backend_id < GC_BACKEND_NR; backend_id++)
-    runtime[backend_id] = 0;
-
 
   if (!(!strcmp (fname, "-")
         || strchr (fname, '/')
@@ -4188,7 +3370,7 @@ gc_apply_profile (const char *fname)
       *p++ = 0;
       value = p;
 
-      option_info = find_option (component_id, name, GC_BACKEND_ANY);
+      option_info = find_option (component_id, name);
       if (!option_info)
         {
           error_count++;
@@ -4235,7 +3417,7 @@ gc_apply_profile (const char *fname)
           xfree (option_info->new_value);
           option_info->new_value = NULL;
         }
-      change_one_value (option_info, runtime, newflags, value, 1);
+      change_one_value (component_id, option_info, runtime, newflags, value, 1);
     }
 
   if (length < 0 || es_ferror (fp))
@@ -4268,9 +3450,10 @@ gc_apply_profile (const char *fname)
 
       if (opt.runtime)
         {
-          for (backend_id = 0; backend_id < GC_BACKEND_NR; backend_id++)
-            if (runtime[backend_id] && gc_backend[backend_id].runtime_change)
-              (*gc_backend[backend_id].runtime_change) (0);
+          for (component_id = 0; component_id < GC_COMPONENT_NR; component_id++)
+            if (runtime[component_id]
+                && gc_component[component_id].runtime_change)
+              (*gc_component[component_id].runtime_change) (0);
         }
     }
 
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index 80a4062..1b3f2be 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -46,6 +46,12 @@ enum cmd_and_opt_values
     oRuntime    = 'r',
     oComponent  = 'c',
     oNull       = '0',
+    aListDirs   = 'L',
+    aKill       = 'K',
+    aReload     = 'R',
+    aShowVersions = 'V',
+    aShowConfigs  = 'X',
+
     oNoVerbose	= 500,
     oHomedir,
     oBuilddir,
@@ -61,15 +67,10 @@ enum cmd_and_opt_values
     aListConfig,
     aCheckConfig,
     aQuerySWDB,
-    aListDirs,
     aLaunch,
-    aKill,
     aCreateSocketDir,
     aRemoveSocketDir,
-    aApplyProfile,
-    aReload,
-    aShowConfigs,
-    aShowVersions
+    aApplyProfile
   };
 
 
@@ -100,8 +101,8 @@ static ARGPARSE_OPTS opts[] =
     { aKill,          "kill", 256,   N_("kill a given component")},
     { aCreateSocketDir, "create-socketdir", 256, "@"},
     { aRemoveSocketDir, "remove-socketdir", 256, "@"},
-    ARGPARSE_c (aShowVersions, "show-versions", "@"),
-    ARGPARSE_c (aShowConfigs,  "show-configs", "@"),
+    ARGPARSE_c (aShowVersions, "show-versions", ""),
+    ARGPARSE_c (aShowConfigs,  "show-configs", ""),
 
     { 301, NULL, 0, N_("@\nOptions:\n ") },
 
@@ -608,7 +609,7 @@ main (int argc, char **argv)
   early_system_init ();
   gnupg_reopen_std (GPGCONF_NAME);
   set_strusage (my_strusage);
-  log_set_prefix (GPGCONF_NAME, GPGRT_LOG_WITH_PREFIX);
+  log_set_prefix (GPGCONF_NAME, GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY);
 
   /* Make sure that our subsystems are ready.  */
   i18n_init();
@@ -678,6 +679,12 @@ main (int argc, char **argv)
 
   fname = argc ? *argv : NULL;
 
+  /* Set the configuraton directories for use by gpgrt_argparser.  We
+   * don't have a configuration file for this program but we have code
+   * which reads the component's config files.  */
+  gnupg_set_confdir (GNUPG_CONFDIR_SYS, gnupg_sysconfdir ());
+  gnupg_set_confdir (GNUPG_CONFDIR_USER, gnupg_homedir ());
+
   switch (cmd)
     {
     case aListComponents:
@@ -1035,8 +1042,43 @@ get_revision_from_blurb (const char *blurb, int *r_len)
 static void
 show_version_gnupg (estream_t fp, const char *prefix)
 {
+  char *fname, *p;
+  size_t n;
+  estream_t verfp;
+  char line[100];
+
   es_fprintf (fp, "%s%sGnuPG %s (%s)\n%s%s\n", prefix, *prefix?"":"* ",
-              strusage (13), BUILD_REVISION, prefix, gpgrt_strusage (17));
+              strusage (13), BUILD_REVISION, prefix, strusage (17));
+
+  /* Show the GnuPG VS-Desktop version in --show-configs mode  */
+  if (prefix && *prefix == '#')
+    {
+      fname = make_filename (gnupg_bindir (), NULL);
+      n = strlen (fname);
+      if (n > 10 && (!ascii_strcasecmp (fname + n - 10, "/GnuPG/bin")
+                     || !ascii_strcasecmp (fname + n - 10, "\\GnuPG\\bin")))
+        {
+          /* Append VERSION to the ../../ direcory.  Note that VERSION
+           * is only 7 bytes and thus fits.  */
+          strcpy (fname + n - 9, "VERSION");
+          verfp = es_fopen (fname, "r");
+          if (!verfp)
+            es_fprintf (fp, "%s[VERSION file not found]\n", prefix);
+          else if (!es_fgets (line, sizeof line, verfp))
+            es_fprintf (fp, "%s[VERSION file is empty]\n", prefix);
+          else
+            {
+              trim_spaces (line);
+              for (p=line; *p; p++)
+                if (*p < ' ' || *p > '~' || *p == '[')
+                  *p = '?';
+              es_fprintf (fp, "%s%s\n", prefix, line);
+            }
+          es_fclose (verfp);
+        }
+      xfree (fname);
+    }
+
 #ifdef HAVE_W32_SYSTEM
   {
     OSVERSIONINFO osvi = { sizeof (osvi) };
@@ -1277,7 +1319,8 @@ show_other_registry_entries (estream_t outfp)
     { 1, "HKLM\\Software\\Gpg4win:Desktop-Version" },
     { 1, "HKLM\\Software\\Gpg4win:VS-Desktop-Version" },
     { 1, "\\" GNUPG_REGISTRY_DIR ":HomeDir" },
-    { 2, "Software\\Microsoft\\Office\\Outlook\\Addins\\GNU.GpgOL"
+    { 1, "\\" GNUPG_REGISTRY_DIR ":DefaultLogFile" },
+    { 2, "\\Software\\Microsoft\\Office\\Outlook\\Addins\\GNU.GpgOL"
       ":LoadBehavior" },
     { 2, "HKCU\\Software\\Microsoft\\Office\\16.0\\Outlook\\Options\\Mail:"
       "ReadAsPlain" },
@@ -1309,6 +1352,7 @@ show_other_registry_entries (estream_t outfp)
   int group = 0;
   char *namebuf = NULL;
   const char *name;
+  int from_hklm;
 
   for (idx=0; (name = names[idx].name); idx++)
     {
@@ -1322,7 +1366,7 @@ show_other_registry_entries (estream_t outfp)
           name = namebuf;
         }
 
-      value = read_w32_reg_string (name);
+      value = read_w32_reg_string (name, &from_hklm);
       if (!value)
         continue;
 
@@ -1337,12 +1381,11 @@ show_other_registry_entries (estream_t outfp)
         }
 
       if (group == 3)
-        es_fprintf (outfp, "### %s=%s\n", names[idx].name, value);
+        es_fprintf (outfp, "### %s=%s%s\n", names[idx].name, value,
+                    from_hklm? " [hklm]":"");
       else
-        es_fprintf (outfp, "### %s\n###   ->%s<-\n", name, value);
-
-      /* FIXME: We may want to add an indiction whethe found via HKLM
-       * or HKCU.  */
+        es_fprintf (outfp, "### %s\n###   ->%s<-%s\n", name, value,
+                    from_hklm? " [hklm]":"");
 
       xfree (value);
     }
@@ -1350,8 +1393,78 @@ show_other_registry_entries (estream_t outfp)
   es_fprintf (outfp, "###\n");
   xfree (namebuf);
 }
+
+
+/* Print registry entries take from a configuration file.  */
+static void
+show_registry_entries_from_file (estream_t outfp)
+{
+  gpg_error_t err;
+  char *fname;
+  estream_t fp;
+  char *line = NULL;
+  size_t length_of_line = 0;
+  size_t  maxlen;
+  ssize_t len;
+  char *value = NULL;
+  int from_hklm;
+  int any = 0;
+
+  fname = make_filename (gnupg_datadir (), "gpgconf.rnames", NULL);
+  fp = es_fopen (fname, "r");
+  if (!fp)
+    {
+      err = gpg_error_from_syserror ();
+      if (gpg_err_code (err) != GPG_ERR_ENOENT)
+        log_error ("error opening '%s': %s\n", fname, gpg_strerror (err));
+      goto leave;
+    }
+
+  maxlen = 2048; /* Set limit.  */
+  while ((len = es_read_line (fp, &line, &length_of_line, &maxlen)) > 0)
+    {
+      if (!maxlen)
+        {
+          err = gpg_error (GPG_ERR_LINE_TOO_LONG);
+          log_error ("error reading '%s': %s\n", fname, gpg_strerror (err));
+          goto leave;
+        }
+      trim_spaces (line);
+      if (*line == '#')
+        continue;
+
+      xfree (value);
+      value = read_w32_reg_string (line, &from_hklm);
+      if (!value)
+        continue;
+
+      if (!any)
+        {
+          any = 1;
+          es_fprintf (outfp, "### Taken from gpgconf.rnames:\n");
+        }
+
+      es_fprintf (outfp, "### %s\n###   ->%s<-%s\n", line, value,
+                  from_hklm? " [hklm]":"");
+
+    }
+  if (len < 0 || es_ferror (fp))
+    {
+      err = gpg_error_from_syserror ();
+      log_error ("error reading '%s': %s\n", fname, gpg_strerror (err));
+    }
+
+ leave:
+  if (any)
+    es_fprintf (outfp, "###\n");
+  xfree (value);
+  xfree (line);
+  es_fclose (fp);
+  xfree (fname);
+}
 #endif /*HAVE_W32_SYSTEM*/
 
+
 /* Show all config files.  */
 static void
 show_configs (estream_t outfp)
@@ -1374,6 +1487,15 @@ show_configs (estream_t outfp)
   show_version_gnupg (outfp, "### ");
   es_fprintf (outfp, "### Libgcrypt %s\n", gcry_check_version (NULL));
   es_fprintf (outfp, "### GpgRT %s\n", gpg_error_check_version (NULL));
+#ifdef HAVE_W32_SYSTEM
+  es_fprintf (outfp, "### Codepages:");
+  if (GetConsoleCP () != GetConsoleOutputCP ())
+    es_fprintf (outfp, " %u/%u", GetConsoleCP (), GetConsoleOutputCP ());
+  else
+    es_fprintf (outfp, " %u", GetConsoleCP ());
+  es_fprintf (outfp, " %u", GetACP ());
+  es_fprintf (outfp, " %u\n", GetOEMCP ());
+#endif
   es_fprintf (outfp, "###\n\n");
 
   list_dirs (outfp, NULL, 1);
@@ -1422,14 +1544,16 @@ show_configs (estream_t outfp)
         if ((sl->flags & 1))
           {
             char *p;
+            int from_hklm;
 
             if (!any)
               {
                 any = 1;
                 es_fprintf (outfp, "###\n### Encountered in config files:\n");
               }
-            if ((p = read_w32_reg_string (sl->d)))
-              es_fprintf (outfp, "### %s ->%s<-\n", sl->d, p);
+            if ((p = read_w32_reg_string (sl->d, &from_hklm)))
+              es_fprintf (outfp, "### %s ->%s<-%s\n", sl->d, p,
+                          from_hklm? " [hklm]":"");
             else
               es_fprintf (outfp, "### %s [not set]\n", sl->d);
             xfree (p);
@@ -1438,6 +1562,7 @@ show_configs (estream_t outfp)
   if (!any)
     es_fprintf (outfp, "###\n");
   show_other_registry_entries (outfp);
+  show_registry_entries_from_file (outfp);
 #endif /*HAVE_W32_SYSTEM*/
 
   free_strlist (list);
diff --git a/tools/gpgconf.h b/tools/gpgconf.h
index adb90a1..83aee9a 100644
--- a/tools/gpgconf.h
+++ b/tools/gpgconf.h
@@ -46,21 +46,24 @@ void gpgconf_failure (gpg_error_t err) GPGRT_ATTR_NORETURN;
 
 /* Component system.  Each component is a set of options that can be
  * configured at the same time.  If you change this, don't forget to
- * update GC_COMPONENT in gpgconf-comp.c.  */
+ * update gc_component[] in gpgconf-comp.c.  */
 typedef enum
   {
+    /* Any component, used as a wildcard arg.  */
+    GC_COMPONENT_ANY,
+
     /* The classic GPG for OpenPGP.  */
     GC_COMPONENT_GPG,
 
+    /* GPG for S/MIME.  */
+    GC_COMPONENT_GPGSM,
+
     /* The GPG Agent.  */
     GC_COMPONENT_GPG_AGENT,
 
     /* The Smardcard Daemon.  */
     GC_COMPONENT_SCDAEMON,
 
-    /* GPG for S/MIME.  */
-    GC_COMPONENT_GPGSM,
-
     /* The LDAP Directory Manager for CRLs.  */
     GC_COMPONENT_DIRMNGR,
 
@@ -69,7 +72,7 @@ typedef enum
 
     /* The number of components.  */
     GC_COMPONENT_NR
-  } gc_component_t;
+  } gc_component_id_t;
 
 
 /* Initialize the components.  */
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index f1b0485..e642da0 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -1,4 +1,6 @@
 /* gpgtar-create.c - Create a TAR archive
+ * Copyright (C) 2016-2017, 2019-2022 g10 Code GmbH
+ * Copyright (C) 2010, 2012, 2013 Werner Koch
  * Copyright (C) 2010 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
  */
 
 #include <config.h>
@@ -25,20 +28,21 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#include <unistd.h>
 #ifdef HAVE_W32_SYSTEM
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #else /*!HAVE_W32_SYSTEM*/
-# include <unistd.h>
 # include <pwd.h>
 # include <grp.h>
 #endif /*!HAVE_W32_SYSTEM*/
-#include <assert.h>
 
 #include "../common/i18n.h"
-#include "../common/exectool.h"
+#include <gpg-error.h>
+#include "../common/exechelp.h"
 #include "../common/sysutils.h"
 #include "../common/ccparray.h"
+#include "../common/membuf.h"
 #include "gpgtar.h"
 
 #ifndef HAVE_LSTAT
@@ -46,6 +50,11 @@
 #endif
 
 
+/* Count the number of written headers.  Extended headers are not
+ * counted. */
+static unsigned long global_header_count;
+
+
 /* Object to control the file scanning.  */
 struct scanctrl_s;
 typedef struct scanctrl_s *scanctrl_t;
@@ -105,7 +114,7 @@ fillup_entry_w32 (tar_header_t hdr)
   for (p=hdr->name; *p; p++)
     if (*p == '/')
       *p = '\\';
-  wfname = utf8_to_wchar (hdr->name);
+  wfname = gpgrt_fname_to_wchar (hdr->name);
   for (p=hdr->name; *p; p++)
     if (*p == '\\')
       *p = '/';
@@ -285,8 +294,10 @@ add_entry (const char *dname, const char *entryname, scanctrl_t scanctrl)
     xfree (hdr);
   else
     {
+      /* FIXME: We don't have the extended info yet available so we
+       * can't print them.  */
       if (opt.verbose)
-        gpgtar_print_header (hdr, log_get_stream ());
+        gpgtar_print_header (hdr, NULL, log_get_stream ());
       *scanctrl->flist_tail = hdr;
       scanctrl->flist_tail = &hdr->next;
     }
@@ -334,7 +345,7 @@ scan_directory (const char *dname, scanctrl_t scanctrl)
     for (p=fname; *p; p++)
       if (*p == '/')
         *p = '\\';
-    wfname = utf8_to_wchar (fname);
+    wfname = gpgrt_fname_to_wchar (fname);
     xfree (fname);
     if (!wfname)
       {
@@ -437,7 +448,7 @@ scan_recursive (const char *dname, scanctrl_t scanctrl)
     }
   scanctrl->nestlevel++;
 
-  assert (scanctrl->flist_tail);
+  log_assert (scanctrl->flist_tail);
   start_tail = scanctrl->flist_tail;
   scan_directory (dname, scanctrl);
   stop_tail = scanctrl->flist_tail;
@@ -488,7 +499,7 @@ store_xoctal (char *buffer, size_t length, unsigned long long value)
   size_t n;
   unsigned long long v;
 
-  assert (length > 1);
+  log_assert (length > 1);
 
   v = value;
   n = length;
@@ -593,16 +604,75 @@ store_gname (char *buffer, size_t length, unsigned long gid)
 }
 
 
+static void
+compute_checksum (void *record)
+{
+  struct ustar_raw_header *raw = record;
+  unsigned long chksum = 0;
+  unsigned char *p;
+  size_t n;
+
+  memset (raw->checksum, ' ', sizeof raw->checksum);
+  p = record;
+  for (n=0; n < RECORDSIZE; n++)
+    chksum += *p++;
+  store_xoctal (raw->checksum, sizeof raw->checksum - 1, chksum);
+  raw->checksum[7] = ' ';
+}
+
+
+
+/* Read a symlink without truncating it.  Caller must release the
+ * returned buffer.  Returns NULL on error.  */
+#ifndef HAVE_W32_SYSTEM
+static char *
+myreadlink (const char *name)
+{
+  char *buffer;
+  size_t size;
+  int nread;
+
+  for (size = 1024; size <= 65536; size *= 2)
+    {
+      buffer = xtrymalloc (size);
+      if (!buffer)
+        return NULL;
+
+      nread = readlink (name, buffer, size - 1);
+      if (nread < 0)
+        {
+          xfree (buffer);
+          return NULL;
+        }
+      if (nread < size - 1)
+        {
+          buffer[nread] = 0;
+          return buffer;  /* Got it. */
+        }
+
+      xfree (buffer);
+    }
+  gpg_err_set_errno (ERANGE);
+  return NULL;
+}
+#endif /*Unix*/
+
+
+
+/* Build a header.  If the filename or the link name ist too long
+ * allocate an exthdr and use a replacement file name in RECORD.
+ * Caller should always release R_EXTHDR; this function initializes it
+ * to point to NULL.  */
 static gpg_error_t
-build_header (void *record, tar_header_t hdr)
+build_header (void *record, tar_header_t hdr, strlist_t *r_exthdr)
 {
   gpg_error_t err;
   struct ustar_raw_header *raw = record;
   size_t namelen, n;
-  unsigned long chksum;
-  unsigned char *p;
+  strlist_t sl;
 
   memset (record, 0, RECORDSIZE);
+  *r_exthdr = NULL;
 
   /* Store name and prefix.  */
   namelen = strlen (hdr->name);
@@ -623,10 +693,23 @@ build_header (void *record, tar_header_t hdr)
         }
       else
         {
-          err = gpg_error (GPG_ERR_TOO_LARGE);
-          log_error ("error storing file '%s': %s\n",
-                     hdr->name, gpg_strerror (err));
-          return err;
+          /* Too long - prepare extended header.  */
+          sl = add_to_strlist_try (r_exthdr, hdr->name);
+          if (!sl)
+            {
+              err = gpg_error_from_syserror ();
+              log_error ("error storing file '%s': %s\n",
+                         hdr->name, gpg_strerror (err));
+              return err;
+            }
+          sl->flags = 1;  /* Mark as path */
+          /* The name we use is not POSIX compliant but because we
+           * expect that (for security issues) a tarball will anyway
+           * be extracted to a unique new directory, a simple counter
+           * will do.  To ease testing we also put in the PID.  The
+           * count is bumped after the header has been written.  */
+          snprintf (raw->name, sizeof raw->name-1, "_@paxheader.%u.%lu",
+                    (unsigned int)getpid(), global_header_count + 1);
         }
     }
 
@@ -659,6 +742,7 @@ build_header (void *record, tar_header_t hdr)
   if (hdr->typeflag == TF_SYMLINK)
     {
       int nread;
+      char *p;
 
       nread = readlink (hdr->name, raw->linkname, sizeof raw->linkname -1);
       if (nread < 0)
@@ -669,22 +753,133 @@ build_header (void *record, tar_header_t hdr)
           return err;
         }
       raw->linkname[nread] = 0;
+      if (nread == sizeof raw->linkname -1)
+        {
+          /* Truncated - read again and store as extended header.  */
+          p = myreadlink (hdr->name);
+          if (!p)
+            {
+              err = gpg_error_from_syserror ();
+              log_error ("error reading symlink '%s': %s\n",
+                         hdr->name, gpg_strerror (err));
+              return err;
+            }
+
+          sl = add_to_strlist_try (r_exthdr, p);
+          xfree (p);
+          if (!sl)
+            {
+              err = gpg_error_from_syserror ();
+              log_error ("error storing syslink '%s': %s\n",
+                         hdr->name, gpg_strerror (err));
+              return err;
+            }
+          sl->flags = 2;  /* Mark as linkpath */
+        }
     }
-#endif /*HAVE_W32_SYSTEM*/
+#endif /*!HAVE_W32_SYSTEM*/
 
-  /* Compute the checksum.  */
-  memset (raw->checksum, ' ', sizeof raw->checksum);
-  chksum = 0;
-  p = record;
-  for (n=0; n < RECORDSIZE; n++)
-    chksum += *p++;
-  store_xoctal (raw->checksum, sizeof raw->checksum - 1, chksum);
-  raw->checksum[7] = ' ';
+  compute_checksum (record);
 
   return 0;
 }
 
 
+/* Add an extended header record (NAME,VALUE) to the buffer MB.  */
+static void
+add_extended_header_record (membuf_t *mb, const char *name, const char *value)
+{
+  size_t n, n0, n1;
+  char numbuf[35];
+  size_t valuelen;
+
+  /* To avoid looping in most cases, we guess the initial value.  */
+  valuelen = strlen (value);
+  n1 = valuelen > 95? 3 : 2;
+  do
+    {
+      n0 = n1;
+      /*       (3 for the space before name, the '=', and the LF.)  */
+      n = n0 + strlen (name) + valuelen + 3;
+      snprintf (numbuf, sizeof numbuf, "%zu", n);
+      n1 = strlen (numbuf);
+    }
+  while (n0 != n1);
+  put_membuf_str (mb, numbuf);
+  put_membuf (mb, " ", 1);
+  put_membuf_str (mb, name);
+  put_membuf (mb, "=", 1);
+  put_membuf (mb, value, valuelen);
+  put_membuf (mb, "\n", 1);
+}
+
+
+
+/* Write the extended header specified by EXTHDR to STREAM.   */
+static gpg_error_t
+write_extended_header (estream_t stream, const void *record, strlist_t exthdr)
+{
+  gpg_error_t err = 0;
+  struct ustar_raw_header raw;
+  strlist_t sl;
+  membuf_t mb;
+  char *buffer, *p;
+  size_t buflen;
+
+  init_membuf (&mb, 2*RECORDSIZE);
+
+  for (sl=exthdr; sl; sl = sl->next)
+    {
+      if (sl->flags == 1)
+        add_extended_header_record (&mb, "path", sl->d);
+      else if (sl->flags == 2)
+        add_extended_header_record (&mb, "linkpath", sl->d);
+    }
+
+  buffer = get_membuf (&mb, &buflen);
+  if (!buffer)
+    {
+      err = gpg_error_from_syserror ();
+      log_error ("error building extended header: %s\n", gpg_strerror (err));
+      goto leave;
+    }
+
+  /* We copy the header from the standard header record, so that an
+   * extracted extended header (using a non-pax aware software) is
+   * written with the same properties as the original file.  The real
+   * entry will overwrite it anyway.  Of course we adjust the size and
+   * the type.  */
+  memcpy (&raw, record, RECORDSIZE);
+  store_xoctal (raw.size,  sizeof raw.size,  buflen);
+  raw.typeflag[0] = 'x'; /* Mark as extended header.  */
+  compute_checksum (&raw);
+
+  err = write_record (stream, &raw);
+  if (err)
+    goto leave;
+
+  for (p = buffer; buflen >= RECORDSIZE; p += RECORDSIZE, buflen -= RECORDSIZE)
+    {
+      err = write_record (stream, p);
+      if (err)
+        goto leave;
+    }
+  if (buflen)
+    {
+      /* Reuse RAW for builidng the last record.  */
+      memcpy (&raw, p, buflen);
+      memset ((char*)&raw+buflen, 0, RECORDSIZE - buflen);
+      err = write_record (stream, &raw);
+      if (err)
+        goto leave;
+    }
+
+ leave:
+  xfree (buffer);
+  return err;
+}
+
+
 static gpg_error_t
 write_file (estream_t stream, tar_header_t hdr)
 {
@@ -692,9 +887,10 @@ write_file (estream_t stream, tar_header_t hdr)
   char record[RECORDSIZE];
   estream_t infp;
   size_t nread, nbytes;
+  strlist_t exthdr = NULL;
   int any;
 
-  err = build_header (record, hdr);
+  err = build_header (record, hdr, &exthdr);
   if (err)
     {
       if (gpg_err_code (err) == GPG_ERR_NOT_SUPPORTED)
@@ -707,7 +903,7 @@ write_file (estream_t stream, tar_header_t hdr)
 
   if (hdr->typeflag == TF_REGULAR)
     {
-      infp = es_fopen (hdr->name, "rb");
+      infp = es_fopen (hdr->name, "rb,sysopen");
       if (!infp)
         {
           err = gpg_error_from_syserror ();
@@ -719,9 +915,12 @@ write_file (estream_t stream, tar_header_t hdr)
   else
     infp = NULL;
 
+  if (exthdr && (err = write_extended_header (stream, record, exthdr)))
+    goto leave;
   err = write_record (stream, record);
   if (err)
     goto leave;
+  global_header_count++;
 
   if (hdr->typeflag == TF_REGULAR)
     {
@@ -741,6 +940,8 @@ write_file (estream_t stream, tar_header_t hdr)
                          any? " (file shrunk?)":"");
               goto leave;
             }
+          else if (nbytes < RECORDSIZE)
+            memset (record + nbytes, 0, RECORDSIZE - nbytes);
           any = 1;
           err = write_record (stream, record);
           if (err)
@@ -757,6 +958,7 @@ write_file (estream_t stream, tar_header_t hdr)
   else if ((err = es_fclose (infp)))
     log_error ("error closing file '%s': %s\n", hdr->name, gpg_strerror (err));
 
+  free_strlist (exthdr);
   return err;
 }
 
@@ -791,8 +993,8 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
   tar_header_t hdr, *start_tail;
   estream_t files_from_stream = NULL;
   estream_t outstream = NULL;
-  estream_t cipher_stream = NULL;
   int eof_seen = 0;
+  pid_t pid = (pid_t)(-1);
 
   memset (scanctrl, 0, sizeof *scanctrl);
   scanctrl->flist_tail = &scanctrl->flist;
@@ -945,64 +1147,37 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
   if (files_from_stream && files_from_stream != es_stdin)
     es_fclose (files_from_stream);
 
-  if (opt.outfile)
-    {
-      if (!strcmp (opt.outfile, "-"))
-        outstream = es_stdout;
-      else
-        outstream = es_fopen (opt.outfile, "wb");
-      if (!outstream)
-        {
-          err = gpg_error_from_syserror ();
-          goto leave;
-        }
-    }
-  else
-    {
-      outstream = es_stdout;
-    }
-
-  if (outstream == es_stdout)
-    es_set_binary (es_stdout);
-
-  if (encrypt || sign)
-    {
-      cipher_stream = outstream;
-      outstream = es_fopenmem (0, "rwb");
-      if (! outstream)
-        {
-          err = gpg_error_from_syserror ();
-          goto leave;
-        }
-    }
-
-  for (hdr = scanctrl->flist; hdr; hdr = hdr->next)
-    {
-      err = write_file (outstream, hdr);
-      if (err)
-        goto leave;
-    }
-  err = write_eof_mark (outstream);
-  if (err)
-    goto leave;
-
   if (encrypt || sign)
     {
       strlist_t arg;
       ccparray_t ccp;
       const char **argv;
 
-      err = es_fseek (outstream, 0, SEEK_SET);
-      if (err)
-        goto leave;
-
       /* '--encrypt' may be combined with '--symmetric', but 'encrypt'
-         is set either way.  Clear it if no recipients are specified.
-         XXX: Fix command handling.  */
+       * is set either way.  Clear it if no recipients are specified.
+       */
       if (opt.symmetric && opt.recipients == NULL)
         encrypt = 0;
 
       ccparray_init (&ccp, 0);
+      if (opt.batch)
+        ccparray_put (&ccp, "--batch");
+      if (opt.answer_yes)
+        ccparray_put (&ccp, "--yes");
+      if (opt.answer_no)
+        ccparray_put (&ccp, "--no");
+      if (opt.require_compliance)
+        ccparray_put (&ccp, "--require-compliance");
+      if (opt.status_fd != -1)
+        {
+          static char tmpbuf[40];
+
+          snprintf (tmpbuf, sizeof tmpbuf, "--status-fd=%d", opt.status_fd);
+          ccparray_put (&ccp, tmpbuf);
+        }
+
+      ccparray_put (&ccp, "--output");
+      ccparray_put (&ccp, opt.outfile? opt.outfile : "-");
       if (encrypt)
         ccparray_put (&ccp, "--encrypt");
       if (sign)
@@ -1030,27 +1205,76 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
           goto leave;
         }
 
-      err = gnupg_exec_tool_stream (opt.gpg_program, argv,
-                                    outstream, NULL, cipher_stream, NULL, NULL);
+      err = gnupg_spawn_process (opt.gpg_program, argv, NULL, NULL,
+                                 (GNUPG_SPAWN_KEEP_STDOUT
+                                  | GNUPG_SPAWN_KEEP_STDERR),
+                                 &outstream, NULL, NULL, &pid);
       xfree (argv);
       if (err)
         goto leave;
+      es_set_binary (outstream);
+    }
+  else if (opt.outfile) /* No crypto  */
+    {
+      if (!strcmp (opt.outfile, "-"))
+        outstream = es_stdout;
+      else
+        outstream = es_fopen (opt.outfile, "wb,sysopen");
+      if (!outstream)
+        {
+          err = gpg_error_from_syserror ();
+          goto leave;
+        }
+      if (outstream == es_stdout)
+        es_set_binary (es_stdout);
+
+    }
+  else /* Also no crypto.  */
+    {
+      outstream = es_stdout;
+      es_set_binary (outstream);
+    }
+
+
+  for (hdr = scanctrl->flist; hdr; hdr = hdr->next)
+    {
+      err = write_file (outstream, hdr);
+      if (err)
+        goto leave;
+    }
+  err = write_eof_mark (outstream);
+  if (err)
+    goto leave;
+
+
+  if (pid != (pid_t)(-1))
+    {
+      int exitcode;
+
+      err = es_fclose (outstream);
+      outstream = NULL;
+      if (err)
+        log_error ("error closing pipe: %s\n", gpg_strerror (err));
+      else
+        {
+          err = gnupg_wait_process (opt.gpg_program, pid, 1, &exitcode);
+          if (err)
+            log_error ("running %s failed (exitcode=%d): %s",
+                       opt.gpg_program, exitcode, gpg_strerror (err));
+          gnupg_release_process (pid);
+          pid = (pid_t)(-1);
+        }
     }
 
  leave:
   if (!err)
     {
       gpg_error_t first_err;
-      if (outstream != es_stdout)
+      if (outstream != es_stdout || pid != (pid_t)(-1))
         first_err = es_fclose (outstream);
       else
         first_err = es_fflush (outstream);
       outstream = NULL;
-      if (cipher_stream != es_stdout)
-        err = es_fclose (cipher_stream);
-      else
-        err = es_fflush (cipher_stream);
-      cipher_stream = NULL;
       if (! err)
         err = first_err;
     }
@@ -1060,8 +1284,6 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
                  opt.outfile ? opt.outfile : "-", gpg_strerror (err));
       if (outstream && outstream != es_stdout)
         es_fclose (outstream);
-      if (cipher_stream && cipher_stream != es_stdout)
-        es_fclose (cipher_stream);
       if (opt.outfile)
         gnupg_remove (opt.outfile);
     }
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index 3da100c..832039b 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -1,4 +1,6 @@
 /* gpgtar-extract.c - Extract from a TAR archive
+ * Copyright (C) 2016-2017, 2019-2022 g10 Code GmbH
+ * Copyright (C) 2010, 2012, 2013 Werner Koch
  * Copyright (C) 2010 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
  */
 
 #include <config.h>
@@ -25,39 +28,79 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <assert.h>
 
 #include "../common/i18n.h"
-#include "../common/exectool.h"
+#include <gpg-error.h>
+#include "../common/exechelp.h"
 #include "../common/sysutils.h"
 #include "../common/ccparray.h"
 #include "gpgtar.h"
 
+static gpg_error_t
+check_suspicious_name (const char *name)
+{
+  size_t n;
+
+  n = strlen (name);
+#ifdef HAVE_DOSISH_SYSTEM
+  if (strchr (name, '\\'))
+    {
+      log_error ("filename '%s' contains a backslash - "
+                 "can't extract on this system\n", name);
+      return gpg_error (GPG_ERR_INV_NAME);
+    }
+#endif /*HAVE_DOSISH_SYSTEM*/
+
+  if (!n
+      || strstr (name, "//")
+      || strstr (name, "/../")
+      || !strncmp (name, "../", 3)
+      || (n >= 3 && !strcmp (name+n-3, "/.." )))
+    {
+      log_error ("filename '%s' has suspicious parts - not extracting\n",
+                 name);
+      return gpg_error (GPG_ERR_INV_NAME);
+    }
+
+  return 0;
+}
+
 
 static gpg_error_t
 extract_regular (estream_t stream, const char *dirname,
-                 tarinfo_t info, tar_header_t hdr)
+                 tarinfo_t info, tar_header_t hdr, strlist_t exthdr)
 {
   gpg_error_t err;
   char record[RECORDSIZE];
   size_t n, nbytes, nwritten;
-  char *fname;
+  char *fname_buffer = NULL;
+  const char *fname;
   estream_t outfp = NULL;
+  strlist_t sl;
 
-  fname = strconcat (dirname, "/", hdr->name, NULL);
-  if (!fname)
+  fname = hdr->name;
+  for (sl = exthdr; sl; sl = sl->next)
+    if (sl->flags == 1)
+      fname = sl->d;
+
+  err = check_suspicious_name (fname);
+  if (err)
+    goto leave;
+
+  fname_buffer = strconcat (dirname, "/", fname, NULL);
+  if (!fname_buffer)
     {
       err = gpg_error_from_syserror ();
       log_error ("error creating filename: %s\n", gpg_strerror (err));
       goto leave;
     }
-  else
-    err = 0;
+  fname = fname_buffer;
+
 
   if (opt.dry_run)
-    outfp = es_fopenmem (0, "wb");
+    outfp = es_fopen ("/dev/null", "wb");
   else
-    outfp = es_fopen (fname, "wb");
+    outfp = es_fopen (fname, "wb,sysopen");
   if (!outfp)
     {
       err = gpg_error_from_syserror ();
@@ -97,29 +140,36 @@ extract_regular (estream_t stream, const char *dirname,
         log_error ("error removing incomplete file '%s': %s\n",
                    fname, gpg_strerror (gpg_error_from_syserror ()));
     }
-  xfree (fname);
+  xfree (fname_buffer);
   return err;
 }
 
 
 static gpg_error_t
-extract_directory (const char *dirname, tar_header_t hdr)
+extract_directory (const char *dirname, tar_header_t hdr, strlist_t exthdr)
 {
   gpg_error_t err;
-  char *fname;
-  size_t prefixlen;
+  const char *name;
+  char *fname = NULL;
+  strlist_t sl;
+
+  name = hdr->name;
+  for (sl = exthdr; sl; sl = sl->next)
+    if (sl->flags == 1)
+      name = sl->d;
+
+  err = check_suspicious_name (name);
+  if (err)
+    goto leave;
 
-  prefixlen = strlen (dirname) + 1;
-  fname = strconcat (dirname, "/", hdr->name, NULL);
+  fname = strconcat (dirname, "/", name, NULL);
   if (!fname)
     {
       err = gpg_error_from_syserror ();
       log_error ("error creating filename: %s\n", gpg_strerror (err));
       goto leave;
     }
-  else
-    err = 0;
-
+  /* Remove a possible trailing slash.  */
   if (fname[strlen (fname)-1] == '/')
     fname[strlen (fname)-1] = 0;
 
@@ -136,8 +186,13 @@ extract_directory (const char *dirname, tar_header_t hdr)
         {
           /* Try to create the directory with parents but keep the
              original error code in case of a failure.  */
-          char *p;
           int rc = 0;
+          char *p;
+          size_t prefixlen;
+
+          /* (PREFIXLEN is the length of the new directory we use to
+           *  extract the tarball.)  */
+          prefixlen = strlen (dirname) + 1;
 
           for (p = fname+prefixlen; (p = strchr (p, '/')); p++)
             {
@@ -165,36 +220,15 @@ extract_directory (const char *dirname, tar_header_t hdr)
 
 static gpg_error_t
 extract (estream_t stream, const char *dirname, tarinfo_t info,
-         tar_header_t hdr)
+         tar_header_t hdr, strlist_t exthdr)
 {
   gpg_error_t err;
   size_t n;
 
-  n = strlen (hdr->name);
-#ifdef HAVE_DOSISH_SYSTEM
-  if (strchr (hdr->name, '\\'))
-    {
-      log_error ("filename '%s' contains a backslash - "
-                 "can't extract on this system\n", hdr->name);
-      return gpg_error (GPG_ERR_INV_NAME);
-    }
-#endif /*HAVE_DOSISH_SYSTEM*/
-
-  if (!n
-      || strstr (hdr->name, "//")
-      || strstr (hdr->name, "/../")
-      || !strncmp (hdr->name, "../", 3)
-      || (n >= 3 && !strcmp (hdr->name+n-3, "/.." )))
-    {
-      log_error ("filename '%s' as suspicious parts - not extracting\n",
-                 hdr->name);
-      return gpg_error (GPG_ERR_INV_NAME);
-    }
-
   if (hdr->typeflag == TF_REGULAR || hdr->typeflag == TF_UNKNOWN)
-    err = extract_regular (stream, dirname, info, hdr);
+    err = extract_regular (stream, dirname, info, hdr, exthdr);
   else if (hdr->typeflag == TF_DIRECTORY)
-    err = extract_directory (dirname, hdr);
+    err = extract_directory (dirname, hdr, exthdr);
   else
     {
       char record[RECORDSIZE];
@@ -283,34 +317,53 @@ gpg_error_t
 gpgtar_extract (const char *filename, int decrypt)
 {
   gpg_error_t err;
-  estream_t stream;
-  estream_t cipher_stream = NULL;
+  estream_t stream = NULL;
   tar_header_t header = NULL;
+  strlist_t extheader = NULL;
   const char *dirprefix = NULL;
   char *dirname = NULL;
   struct tarinfo_s tarinfo_buffer;
   tarinfo_t tarinfo = &tarinfo_buffer;
+  pid_t pid = (pid_t)(-1);
+  char *logfilename = NULL;
+
 
   memset (&tarinfo_buffer, 0, sizeof tarinfo_buffer);
 
-  if (filename)
+  if (opt.directory)
+    dirname = xtrystrdup (opt.directory);
+  else
     {
-      if (!strcmp (filename, "-"))
-        stream = es_stdin;
-      else
-        stream = es_fopen (filename, "rb");
-      if (!stream)
+      if (opt.filename)
         {
-          err = gpg_error_from_syserror ();
-          log_error ("error opening '%s': %s\n", filename, gpg_strerror (err));
-          return err;
+          dirprefix = strrchr (opt.filename, '/');
+          if (dirprefix)
+            dirprefix++;
+          else
+            dirprefix = opt.filename;
+        }
+      else if (filename)
+        {
+          dirprefix = strrchr (filename, '/');
+          if (dirprefix)
+            dirprefix++;
+          else
+            dirprefix = filename;
+        }
+
+      if (!dirprefix || !*dirprefix)
+        dirprefix = "GPGARCH";
+
+      dirname = create_directory (dirprefix);
+      if (!dirname)
+        {
+          err = gpg_error (GPG_ERR_GENERAL);
+          goto leave;
         }
     }
-  else
-    stream = es_stdin;
 
-  if (stream == es_stdin)
-    es_set_binary (es_stdin);
+  if (opt.verbose)
+    log_info ("extracting to '%s/'\n", dirname);
 
   if (decrypt)
     {
@@ -318,19 +371,34 @@ gpgtar_extract (const char *filename, int decrypt)
       ccparray_t ccp;
       const char **argv;
 
-      cipher_stream = stream;
-      stream = es_fopenmem (0, "rwb");
-      if (! stream)
-        {
-          err = gpg_error_from_syserror ();
-          goto leave;
-        }
-
       ccparray_init (&ccp, 0);
+      if (opt.batch)
+        ccparray_put (&ccp, "--batch");
+      if (opt.require_compliance)
+        ccparray_put (&ccp, "--require-compliance");
+      if (opt.status_fd != -1)
+        {
+          static char tmpbuf[40];
 
+          snprintf (tmpbuf, sizeof tmpbuf, "--status-fd=%d", opt.status_fd);
+          ccparray_put (&ccp, tmpbuf);
+        }
+      if (opt.with_log)
+        {
+          ccparray_put (&ccp, "--log-file");
+          logfilename = xstrconcat (dirname, ".log", NULL);
+          ccparray_put (&ccp, logfilename);
+        }
+      ccparray_put (&ccp, "--output");
+      ccparray_put (&ccp, "-");
       ccparray_put (&ccp, "--decrypt");
       for (arg = opt.gpg_arguments; arg; arg = arg->next)
         ccparray_put (&ccp, arg->d);
+      if (filename)
+        {
+          ccparray_put (&ccp, "--");
+          ccparray_put (&ccp, filename);
+        }
 
       ccparray_put (&ccp, NULL);
       argv = ccparray_get (&ccp, NULL);
@@ -340,72 +408,78 @@ gpgtar_extract (const char *filename, int decrypt)
           goto leave;
         }
 
-      err = gnupg_exec_tool_stream (opt.gpg_program, argv,
-                                    cipher_stream, NULL, stream, NULL, NULL);
+      err = gnupg_spawn_process (opt.gpg_program, argv, NULL, NULL,
+                                 ((filename? 0 : GNUPG_SPAWN_KEEP_STDIN)
+                                  | GNUPG_SPAWN_KEEP_STDERR),
+                                 NULL, &stream, NULL, &pid);
       xfree (argv);
       if (err)
         goto leave;
-
-      err = es_fseek (stream, 0, SEEK_SET);
-      if (err)
-        goto leave;
+      es_set_binary (stream);
     }
-
-  if (opt.directory)
-    dirname = xtrystrdup (opt.directory);
-  else
+  else if (filename)
     {
-      if (opt.filename)
-        {
-          dirprefix = strrchr (opt.filename, '/');
-          if (dirprefix)
-            dirprefix++;
-          else
-            dirprefix = opt.filename;
-        }
-      else if (filename)
-        {
-          dirprefix = strrchr (filename, '/');
-          if (dirprefix)
-            dirprefix++;
-          else
-            dirprefix = filename;
-        }
-
-      if (!dirprefix || !*dirprefix)
-        dirprefix = "GPGARCH";
-
-      dirname = create_directory (dirprefix);
-      if (!dirname)
+      if (!strcmp (filename, "-"))
+        stream = es_stdin;
+      else
+        stream = es_fopen (filename, "rb,sysopen");
+      if (!stream)
         {
-          err = gpg_error (GPG_ERR_GENERAL);
-          goto leave;
+          err = gpg_error_from_syserror ();
+          log_error ("error opening '%s': %s\n", filename, gpg_strerror (err));
+          return err;
         }
+      if (stream == es_stdin)
+        es_set_binary (es_stdin);
+    }
+  else
+    {
+      stream = es_stdin;
+      es_set_binary (es_stdin);
     }
 
-  if (opt.verbose)
-    log_info ("extracting to '%s/'\n", dirname);
 
   for (;;)
     {
-      err = gpgtar_read_header (stream, tarinfo, &header);
+      err = gpgtar_read_header (stream, tarinfo, &header, &extheader);
       if (err || header == NULL)
         goto leave;
 
-      err = extract (stream, dirname, tarinfo, header);
+      err = extract (stream, dirname, tarinfo, header, extheader);
       if (err)
         goto leave;
+      free_strlist (extheader);
+      extheader = NULL;
       xfree (header);
       header = NULL;
     }
 
+  if (pid != (pid_t)(-1))
+    {
+      int exitcode;
+
+      err = es_fclose (stream);
+      stream = NULL;
+      if (err)
+        log_error ("error closing pipe: %s\n", gpg_strerror (err));
+      else
+        {
+          err = gnupg_wait_process (opt.gpg_program, pid, 1, &exitcode);
+          if (err)
+            log_error ("running %s failed (exitcode=%d): %s",
+                       opt.gpg_program, exitcode, gpg_strerror (err));
+          gnupg_release_process (pid);
+          pid = (pid_t)(-1);
+        }
+    }
+
 
  leave:
+  free_strlist (extheader);
   xfree (header);
   xfree (dirname);
+  xfree (logfilename);
   if (stream != es_stdin)
     es_fclose (stream);
-  if (stream != cipher_stream)
-    es_fclose (cipher_stream);
   return err;
 }
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c
index 396e837..08ab967 100644
--- a/tools/gpgtar-list.c
+++ b/tools/gpgtar-list.c
@@ -1,4 +1,6 @@
 /* gpgtar-list.c - List a TAR archive
+ * Copyright (C) 2016-2017, 2019-2022 g10 Code GmbH
+ * Copyright (C) 2010, 2012, 2013 Werner Koch
  * Copyright (C) 2010 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
  */
 
 #include <config.h>
@@ -22,11 +25,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include "../common/i18n.h"
+#include <gpg-error.h>
 #include "gpgtar.h"
-#include "../common/exectool.h"
+#include "../common/exechelp.h"
+#include "../common/sysutils.h"
 #include "../common/ccparray.h"
 
 
@@ -160,11 +164,15 @@ parse_header (const void *record, const char *filename, tarinfo_t info)
     case '5': header->typeflag = TF_DIRECTORY; break;
     case '6': header->typeflag = TF_FIFO; break;
     case '7': header->typeflag = TF_RESERVED; break;
+    case 'g': header->typeflag = TF_GEXTHDR; break;
+    case 'x': header->typeflag = TF_EXTHDR; break;
     default:  header->typeflag = TF_UNKNOWN; break;
     }
 
   /* Compute the number of data records following this header.  */
-  if (header->typeflag == TF_REGULAR || header->typeflag == TF_UNKNOWN)
+  if (header->typeflag == TF_REGULAR
+      || header->typeflag == TF_EXTHDR
+      || header->typeflag == TF_UNKNOWN)
     header->nrecords = (header->size + RECORDSIZE-1)/RECORDSIZE;
   else
     header->nrecords = 0;
@@ -181,18 +189,93 @@ parse_header (const void *record, const char *filename, tarinfo_t info)
   return header;
 }
 
+/* Parse the extended header.  This funcion may modify BUFFER.  */
+static gpg_error_t
+parse_extended_header (const char *fname,
+                       char *buffer, size_t buflen, strlist_t *r_exthdr)
+{
+  unsigned int reclen;
+  unsigned char *p, *record;
+  strlist_t sl;
+
+  while (buflen)
+    {
+      record = buffer; /* Remember begin of record.  */
+      reclen = 0;
+      for (p = buffer; buflen && digitp (p); buflen--, p++)
+        {
+          reclen *= 10;
+          reclen += (*p - '0');
+        }
+      if (!buflen || *p != ' ')
+        {
+          log_error ("%s: malformed record length in extended header\n", fname);
+          return gpg_error (GPG_ERR_INV_RECORD);
+        }
+      p++;  /* Skip space.  */
+      buflen--;
+      if (buflen + (p-record) < reclen)
+        {
+          log_error ("%s: extended header record larger"
+                     " than total extended header data\n", fname);
+          return gpg_error (GPG_ERR_INV_RECORD);
+        }
+      if (reclen < (p-record)+2 || record[reclen-1] != '\n')
+        {
+          log_error ("%s: malformed extended header record\n", fname);
+          return gpg_error (GPG_ERR_INV_RECORD);
+        }
+      record[reclen-1] = 0; /* For convenience change LF to a Nul. */
+      reclen -= (p-record);
+      /* P points to the begin of the keyword and RECLEN is the
+       * remaining length of the record excluding the LF.  */
+      if (memchr (p, 0, reclen-1)
+          && (!strncmp (p, "path=", 5) || !strncmp (p, "linkpath=", 9)))
+        {
+          log_error ("%s: extended header record has an embedded nul"
+                     " - ignoring\n", fname);
+        }
+      else if (!strncmp (p, "path=", 5))
+        {
+          sl = add_to_strlist_try (r_exthdr, p+5);
+          if (!sl)
+            return gpg_error_from_syserror ();
+          sl->flags = 1;  /* Mark as path */
+        }
+      else if (!strncmp (p, "linkpath=", 9))
+        {
+          sl = add_to_strlist_try (r_exthdr, p+9);
+          if (!sl)
+            return gpg_error_from_syserror ();
+          sl->flags = 2;  /* Mark as linkpath */
+        }
+
+      buffer = p + reclen;
+      buflen -= reclen;
+    }
+
+  return 0;
+}
 
 
 /* Read the next block, assuming it is a tar header.  Returns a header
-   object on success in R_HEADER, or an error.  If the stream is
-   consumed, R_HEADER is set to NULL.  In case of an error an error
-   message has been printed.  */
+ * object on success in R_HEADER, or an error.  If the stream is
+ * consumed (i.e. end-of-archive), R_HEADER is set to NULL.  In case
+ * of an error an error message is printed.  If the header is an
+ * extended header, a string list is allocated and stored at
+ * R_EXTHEADER; the caller should provide a pointer to NULL.  Such an
+ * extended header is fully processed here and the returned R_HEADER
+ * has then the next regular header.  */
 static gpg_error_t
-read_header (estream_t stream, tarinfo_t info, tar_header_t *r_header)
+read_header (estream_t stream, tarinfo_t info,
+             tar_header_t *r_header, strlist_t *r_extheader)
 {
   gpg_error_t err;
   char record[RECORDSIZE];
   int i;
+  tar_header_t hdr;
+  char *buffer;
+  size_t buflen, nrec;
 
   err = read_record (stream, record);
   if (err)
@@ -224,7 +307,67 @@ read_header (estream_t stream, tarinfo_t info, tar_header_t *r_header)
     }
 
   *r_header = parse_header (record, es_fname_get (stream), info);
-  return *r_header ? 0 : gpg_error_from_syserror ();
+  if (!*r_header)
+    return gpg_error_from_syserror ();
+  hdr = *r_header;
+
+  if (hdr->typeflag != TF_EXTHDR || !r_extheader)
+    return 0;
+
+  /* Read the extended header.  */
+  if (!hdr->nrecords)
+    {
+      /* More than 64k for an extedned header is surely too large.  */
+      log_info ("%s: warning: empty extended header\n",
+                 es_fname_get (stream));
+      return 0;
+    }
+  if (hdr->nrecords > 65536 / RECORDSIZE)
+    {
+      /* More than 64k for an extedned header is surely too large.  */
+      log_error ("%s: extended header too large - skipping\n",
+                 es_fname_get (stream));
+      return 0;
+    }
+
+  buffer = xtrymalloc (hdr->nrecords * RECORDSIZE);
+  if (!buffer)
+    {
+      err = gpg_error_from_syserror ();
+      log_error ("%s: error allocating space for extended header: %s\n",
+                 es_fname_get (stream), gpg_strerror (err));
+      return err;
+    }
+  buflen = 0;
+
+  for (nrec=0; nrec < hdr->nrecords;)
+    {
+      err = read_record (stream, buffer + buflen);
+      if (err)
+        {
+          xfree (buffer);
+          return err;
+        }
+      info->nblocks++;
+      nrec++;
+      if (nrec < hdr->nrecords || (hdr->size && !(hdr->size % RECORDSIZE)))
+        buflen += RECORDSIZE;
+      else
+        buflen += (hdr->size % RECORDSIZE);
+    }
+
+  err = parse_extended_header (es_fname_get (stream),
+                               buffer, buflen, r_extheader);
+  if (err)
+    {
+      free_strlist (*r_extheader);
+      *r_extheader = NULL;
+    }
+
+  xfree (buffer);
+  /* Now tha the extedned header has been read, we read the next
+   * header without allowing an extended header.  */
+  return read_header (stream, info, r_header, NULL);
 }
 
 
@@ -249,11 +392,13 @@ skip_data (estream_t stream, tarinfo_t info, tar_header_t header)
 
 
 static void
-print_header (tar_header_t header, estream_t out)
+print_header (tar_header_t header, strlist_t extheader, estream_t out)
 {
   unsigned long mask;
   char modestr[10+1];
   int i;
+  strlist_t sl;
+  const char *name, *linkname;
 
   *modestr = '?';
   switch (header->typeflag)
@@ -266,6 +411,8 @@ print_header (tar_header_t header, estream_t out)
     case TF_DIRECTORY:*modestr = 'd'; break;
     case TF_FIFO:     *modestr = 'f'; break;
     case TF_RESERVED: *modestr = '='; break;
+    case TF_EXTHDR:   break;
+    case TF_GEXTHDR:  break;
     case TF_UNKNOWN:  break;
     case TF_NOTSUP:   break;
     }
@@ -279,9 +426,25 @@ print_header (tar_header_t header, estream_t out)
     modestr[9] = modestr[9] == 'x'? 't':'T';
   modestr[10] = 0;
 
-  es_fprintf (out, "%s %lu %lu/%lu %12llu %s %s\n",
+  /* FIXME: We do not parse the linkname unless its part of an
+   * extended header.  */
+  name = header->name;
+  linkname = header->typeflag == TF_SYMLINK? "?" : NULL;
+
+  for (sl = extheader; sl; sl = sl->next)
+    {
+      if (sl->flags == 1)
+        name = sl->d;
+      else if (sl->flags == 2)
+        linkname = sl->d;
+    }
+
+  es_fprintf (out, "%s %lu %lu/%lu %12llu %s %s%s%s\n",
               modestr, header->nlink, header->uid, header->gid, header->size,
-              isotimestamp (header->mtime), header->name);
+              isotimestamp (header->mtime),
+              name,
+              linkname? " -> " : "",
+              linkname? linkname : "");
 }
 
 
@@ -292,52 +455,43 @@ gpg_error_t
 gpgtar_list (const char *filename, int decrypt)
 {
   gpg_error_t err;
-  estream_t stream;
-  estream_t cipher_stream = NULL;
+  estream_t stream = NULL;
   tar_header_t header = NULL;
+  strlist_t extheader = NULL;
   struct tarinfo_s tarinfo_buffer;
   tarinfo_t tarinfo = &tarinfo_buffer;
+  pid_t pid = (pid_t)(-1);
 
   memset (&tarinfo_buffer, 0, sizeof tarinfo_buffer);
 
-  if (filename)
-    {
-      if (!strcmp (filename, "-"))
-        stream = es_stdin;
-      else
-        stream = es_fopen (filename, "rb");
-      if (!stream)
-        {
-          err = gpg_error_from_syserror ();
-          log_error ("error opening '%s': %s\n", filename, gpg_strerror (err));
-          return err;
-        }
-    }
-  else
-    stream = es_stdin;
-
-  if (stream == es_stdin)
-    es_set_binary (es_stdin);
-
   if (decrypt)
     {
       strlist_t arg;
       ccparray_t ccp;
       const char **argv;
 
-      cipher_stream = stream;
-      stream = es_fopenmem (0, "rwb");
-      if (! stream)
-        {
-          err = gpg_error_from_syserror ();
-          goto leave;
-        }
-
       ccparray_init (&ccp, 0);
+      if (opt.batch)
+        ccparray_put (&ccp, "--batch");
+      if (opt.require_compliance)
+        ccparray_put (&ccp, "--require-compliance");
+      if (opt.status_fd != -1)
+        {
+          static char tmpbuf[40];
 
+          snprintf (tmpbuf, sizeof tmpbuf, "--status-fd=%d", opt.status_fd);
+          ccparray_put (&ccp, tmpbuf);
+        }
+      ccparray_put (&ccp, "--output");
+      ccparray_put (&ccp, "-");
       ccparray_put (&ccp, "--decrypt");
       for (arg = opt.gpg_arguments; arg; arg = arg->next)
         ccparray_put (&ccp, arg->d);
+      if (filename)
+        {
+          ccparray_put (&ccp, "--");
+          ccparray_put (&ccp, filename);
+        }
 
       ccparray_put (&ccp, NULL);
       argv = ccparray_get (&ccp, NULL);
@@ -347,50 +501,90 @@ gpgtar_list (const char *filename, int decrypt)
           goto leave;
         }
 
-      err = gnupg_exec_tool_stream (opt.gpg_program, argv,
-                                    cipher_stream, NULL, stream, NULL, NULL);
+      err = gnupg_spawn_process (opt.gpg_program, argv, NULL, NULL,
+                                 ((filename? 0 : GNUPG_SPAWN_KEEP_STDIN)
+                                  | GNUPG_SPAWN_KEEP_STDERR),
+                                 NULL, &stream, NULL, &pid);
       xfree (argv);
       if (err)
         goto leave;
-
-      err = es_fseek (stream, 0, SEEK_SET);
-      if (err)
-        goto leave;
+      es_set_binary (stream);
+    }
+  else if (filename)  /* No decryption requested.  */
+    {
+      if (!strcmp (filename, "-"))
+        stream = es_stdin;
+      else
+        stream = es_fopen (filename, "rb,sysopen");
+      if (!stream)
+        {
+          err = gpg_error_from_syserror ();
+          log_error ("error opening '%s': %s\n", filename, gpg_strerror (err));
+          goto leave;
+        }
+      if (stream == es_stdin)
+        es_set_binary (es_stdin);
+    }
+  else
+    {
+      stream = es_stdin;
+      es_set_binary (es_stdin);
     }
 
   for (;;)
     {
-      err = read_header (stream, tarinfo, &header);
+      err = read_header (stream, tarinfo, &header, &extheader);
       if (err || header == NULL)
         goto leave;
 
-      print_header (header, es_stdout);
+      print_header (header, extheader, es_stdout);
 
       if (skip_data (stream, tarinfo, header))
         goto leave;
+      free_strlist (extheader);
+      extheader = NULL;
       xfree (header);
       header = NULL;
     }
 
+  if (pid != (pid_t)(-1))
+    {
+      int exitcode;
+
+      err = es_fclose (stream);
+      stream = NULL;
+      if (err)
+        log_error ("error closing pipe: %s\n", gpg_strerror (err));
+      else
+        {
+          err = gnupg_wait_process (opt.gpg_program, pid, 1, &exitcode);
+          if (err)
+            log_error ("running %s failed (exitcode=%d): %s",
+                       opt.gpg_program, exitcode, gpg_strerror (err));
+          gnupg_release_process (pid);
+          pid = (pid_t)(-1);
+        }
+    }
 
  leave:
+  free_strlist (extheader);
   xfree (header);
   if (stream != es_stdin)
     es_fclose (stream);
-  if (stream != cipher_stream)
-    es_fclose (cipher_stream);
   return err;
 }
 
+
 gpg_error_t
-gpgtar_read_header (estream_t stream, tarinfo_t info, tar_header_t *r_header)
+gpgtar_read_header (estream_t stream, tarinfo_t info,
+                    tar_header_t *r_header, strlist_t *r_extheader)
 {
-  return read_header (stream, info, r_header);
+  return read_header (stream, info, r_header, r_extheader);
 }
 
 void
-gpgtar_print_header (tar_header_t header, estream_t out)
+gpgtar_print_header (tar_header_t header, strlist_t extheader, estream_t out)
 {
   if (header && out)
-    print_header (header, out);
+    print_header (header, extheader, out);
 }
diff --git a/tools/gpgtar.c b/tools/gpgtar.c
index c2f24ec..e86ed32 100644
--- a/tools/gpgtar.c
+++ b/tools/gpgtar.c
@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #define INCLUDED_BY_MAIN_MODULE 1
 #include "../common/util.h"
@@ -77,12 +76,19 @@ enum cmd_and_opt_values
     oNull,
     oUtf8Strings,
 
+    oBatch,
+    oAnswerYes,
+    oAnswerNo,
+    oStatusFD,
+    oRequireCompliance,
+    oWithLog,
+
     /* Compatibility with gpg-zip.  */
     oGpgArgs,
     oTarArgs,
 
     /* Debugging.  */
-    oDryRun,
+    oDryRun
   };
 
 
@@ -113,6 +119,13 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oOpenPGP, "openpgp", "@"),
   ARGPARSE_s_n (oCMS, "cms", "@"),
 
+  ARGPARSE_s_n (oBatch, "batch", "@"),
+  ARGPARSE_s_n (oAnswerYes, "yes", "@"),
+  ARGPARSE_s_n (oAnswerNo, "no", "@"),
+  ARGPARSE_s_i (oStatusFD, "status-fd", "@"),
+  ARGPARSE_s_n (oRequireCompliance, "require-compliance", "@"),
+  ARGPARSE_s_n (oWithLog, "with-log", "@"),
+
   ARGPARSE_group (302, N_("@\nTar options:\n ")),
 
   ARGPARSE_s_s (oDirectory, "directory",
@@ -259,7 +272,7 @@ shell_parse_stringlist (const char *str, strlist_t *r_list)
           break;
 
         case doublequote:
-          assert (s > str || !"cannot be quoted at first char");
+          log_assert (s > str || !"cannot be quoted at first char");
           if (*s == doublequote && *(s - 1) != '\\')
             quoted = unquoted;
           else
@@ -267,7 +280,7 @@ shell_parse_stringlist (const char *str, strlist_t *r_list)
           break;
 
         default:
-          assert (! "reached");
+          log_assert (! "reached");
         }
     }
 
@@ -373,6 +386,13 @@ parse_arguments (ARGPARSE_ARGS *pargs, ARGPARSE_OPTS *popts)
         case oOpenPGP: /* Dummy option for now.  */ break;
         case oCMS:     /* Dummy option for now.  */ break;
 
+        case oBatch: opt.batch = 1; break;
+        case oAnswerYes: opt.answer_yes = 1; break;
+        case oAnswerNo: opt.answer_no = 1; break;
+        case oStatusFD: opt.status_fd = pargs->r.ret_int; break;
+        case oRequireCompliance: opt.require_compliance = 1; break;
+        case oWithLog: opt.with_log = 1; break;
+
         case oGpgArgs:;
           {
             strlist_t list;
@@ -438,9 +458,13 @@ main (int argc, char **argv)
   /* Make sure that our subsystems are ready.  */
   i18n_init();
   init_common_subsystems (&argc, &argv);
+  gnupg_init_signals (0, NULL);
 
   log_assert (sizeof (struct ustar_raw_header) == 512);
 
+  /* Set default options */
+  opt.status_fd = -1;
+
   /* Parse the command line. */
   pargs.argc  = &argc;
   pargs.argv  = &argv;
@@ -523,7 +547,7 @@ main (int argc, char **argv)
 
 
 /* Read the next record from STREAM.  RECORD is a buffer provided by
-   the caller and must be at leadt of size RECORDSIZE.  The function
+   the caller and must be at least of size RECORDSIZE.  The function
    return 0 on success and error code on failure; a diagnostic
    printed as well.  Note that there is no need for an EOF indicator
    because a tarball has an explicit EOF record. */
diff --git a/tools/gpgtar.h b/tools/gpgtar.h
index 599f17f..9f3c90f 100644
--- a/tools/gpgtar.h
+++ b/tools/gpgtar.h
@@ -41,6 +41,12 @@ struct
   int symmetric;
   const char *filename;
   const char *directory;
+  int batch;
+  int answer_yes;
+  int answer_no;
+  int status_fd;
+  int require_compliance;
+  int with_log;
 } opt;
 
 
@@ -95,6 +101,8 @@ typedef enum
     TF_DIRECTORY,
     TF_FIFO,
     TF_RESERVED,
+    TF_GEXTHDR,    /* Global extended header.  */
+    TF_EXTHDR,     /* Extended header.  */
     TF_UNKNOWN,    /* Needs to be treated as regular file.  */
     TF_NOTSUP      /* Not supported (used with --create).  */
   } typeflag_t;
@@ -140,8 +148,9 @@ gpg_error_t gpgtar_extract (const char *filename, int decrypt);
 /*-- gpgtar-list.c --*/
 gpg_error_t gpgtar_list (const char *filename, int decrypt);
 gpg_error_t gpgtar_read_header (estream_t stream, tarinfo_t info,
-                                tar_header_t *r_header);
-void gpgtar_print_header (tar_header_t header, estream_t out);
+                                tar_header_t *r_header, strlist_t *r_extheader);
+void gpgtar_print_header (tar_header_t header, strlist_t extheader,
+                          estream_t out);
 
 
 #endif /*GPGTAR_H*/
diff --git a/tools/wks-util.c b/tools/wks-util.c
index 025b1b7..4fa28bb 100644
--- a/tools/wks-util.c
+++ b/tools/wks-util.c
@@ -790,6 +790,12 @@ wks_fname_from_userid (const char *userid, int hash_only,
   domain = strchr (addrspec, '@');
   log_assert (domain);
   domain++;
+  if (strchr (domain, '/') || strchr (domain, '\\'))
+    {
+      log_info ("invalid domain detected ('%s')\n", domain);
+      err = gpg_error (GPG_ERR_NOT_FOUND);
+      goto leave;
+    }
 
   /* Hash user ID and create filename.  */
   s = strchr (addrspec, '@');
@@ -845,6 +851,11 @@ wks_compute_hu_fname (char **r_fname, const char *addrspec)
   if (!domain || !domain[1] || domain == addrspec)
     return gpg_error (GPG_ERR_INV_ARG);
   domain++;
+  if (strchr (domain, '/') || strchr (domain, '\\'))
+    {
+      log_info ("invalid domain detected ('%s')\n", domain);
+      return gpg_error (GPG_ERR_NOT_FOUND);
+    }
 
   gcry_md_hash_buffer (GCRY_MD_SHA1, sha1buf, addrspec, domain - addrspec - 1);
   hash = zb32_encode (sha1buf, 8*20);
@@ -893,6 +904,11 @@ ensure_policy_file (const char *addrspec)
   if (!domain || !domain[1] || domain == addrspec)
     return gpg_error (GPG_ERR_INV_ARG);
   domain++;
+  if (strchr (domain, '/') || strchr (domain, '\\'))
+    {
+      log_info ("invalid domain detected ('%s')\n", domain);
+      return gpg_error (GPG_ERR_NOT_FOUND);
+    }
 
   /* Create the filename.  */
   fname = make_filename_try (opt.directory, domain, "policy", NULL);